jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'Sir-Boops/gnome3.24'

Browse source
This commit is contained in:
Enno Boland 2017-04-13 23:35:21 +02:00
parent 419841d98a 2ac29b2e94
commit 6e26cad57c
17 changed files with 139 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/shlibs
View file

@ -2808,3 +2808,9 @@ libbearssl.so.0 bearssl-0.3_1
libXfont2.so.2 libXfont2-2.0.1_1
libqalculate.so.7 libqalculate-0.9.11_1
libweston-2.so.0 weston-2.0.0_1
libmutter-0.so.0 mutter-3.24.0_1
libmutter-clutter-0.so mutter-3.24.0_1
libmutter-cogl-path-0.so mutter-3.24.0_1
libmutter-cogl-0.so mutter-3.24.0_1
libmutter-cogl-pango-0.so mutter-3.24.0_1
libmozjs-.so mozjs38-38.8.0_1

6
srcpkgs/bijiben/template
View file

@ -1,7 +1,7 @@
# Template file for 'bijiben'
pkgname=bijiben
version=3.20.2
revision=2
version=3.21.2
revision=1
build_style=gnu-configure
configure_args="--disable-update-mimedb"
hostmakedepends="pkg-config intltool itstool gobject-introspection"
@ -16,4 +16,4 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://live.gnome.org/Apps/Bijiben"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=5774dfdedb79f5ffe5bac3cebe0816dc7e6410381744dcb999815061dee6a981
checksum=d7f05abd82da837d8d48d9f7acc6035a289d934c722fc89870d17007ba158e0d

6
srcpkgs/gdm/template
View file

@ -1,6 +1,6 @@
# Template file for 'gdm'
pkgname=gdm
version=3.22.3
version=3.24.0
revision=1
build_style=gnu-configure
configure_args="$(vopt_enable gir introspection)
@ -8,7 +8,7 @@ configure_args="$(vopt_enable gir introspection)
--with-at-spi-registryd-directory=/usr/libexec --without-tcp-wrappers
--with-screenshot-dir=/var/lib/gdm/greeter --sbindir=/usr/bin --without-plymouth
--with-xauth-dir=/run/gdm --with-pid-file=/run/gdm/gdm.pid
--disable-systemd-journal --with-initial-vt=7"
--disable-systemd-journal --with-initial-vt=7 --enable-wayland-support"
hostmakedepends="automake libtool pkg-config itstool intltool gnome-doc-utils
$(vopt_if gir gobject-introspection)"
makedepends="glib-devel iso-codes gettext-devel
@ -32,7 +32,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=e7ca3ce77140efe1920f8864c2c77f89bc9f9f75e70e744994cf0a70d8780963
checksum=309ac91eba7d3e20343d0c86d95be1ed3100f91a0b4cb80b121161c4191d25b3
# Package build options
build_options="gir"

8
srcpkgs/gjs/template
View file

@ -1,17 +1,17 @@
# Template file for 'gjs'
pkgname=gjs
version=1.46.0
revision=2
version=1.48.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool glib-devel gobject-introspection"
makedepends="libffi-devel libgirepository-devel dbus-glib-devel
cairo-devel readline-devel mozjs24-devel"
cairo-devel readline-devel mozjs38-devel"
short_desc="Mozilla-based javascript bindings for the GNOME platform"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="MPL-1.1, LGPL-2.1, GPL-2"
homepage="http://live.gnome.org/Gjs"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=2283591fa70785443793e1d7db66071b36052d707075f229baeb468d8dd25ad4
checksum=ed7db93e12709fe43b2fbe1e157331a0b1dcf3e0d19b81ccebd2d96bfcbe9525
gjs-devel_package() {
depends="libgirepository-devel mozjs24-devel gjs>=${version}_${revision}"

6
srcpkgs/gnome-desktop/template
View file

@ -1,9 +1,9 @@
# Template file for 'gnome-desktop'
pkgname=gnome-desktop
version=3.22.2
version=3.24.1
revision=1
build_style=gnu-configure
configure_args="--with-gnome-distributor=void"
configure_args="--with-gnome-distributor=VoidLinux"
hostmakedepends="pkg-config intltool itstool gnome-doc-utils $(vopt_if gir gobject-introspection)"
makedepends="libxkbfile-devel gtk+3-devel gsettings-desktop-schemas-devel
xkeyboard-config iso-codes"
@ -13,7 +13,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2, LGPL-2.1"
homepage="http://www.gnome.org"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=51d7ebf7a6c359be14c3dd7a022213e931484653815eb10b0131bef4c8979e1c
checksum=de09b7d38b4baccae48c527778480731cb12f00848758be186971b2b4acc45ab
build_options="gir"
if [ -z "$CROSS_BUILD" ]; then

4
srcpkgs/gnome-initial-setup/template
View file

@ -1,6 +1,6 @@
# Template file for 'gnome-initial-setup'.
pkgname=gnome-initial-setup
version=3.22.1
version=3.24.0
revision=1
build_style=gnu-configure
hostmakedepends="pkg-config intltool $(vopt_if gir gobject-introspection)"
@ -15,7 +15,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=56a663d84ab16854afbdd5ea852f0b76bb5e30829f14f3a224ea130c14825468
checksum=c66fadfb5ec8febaecbd81d6bf976cbf9557e9f65efd4d8e59ef712700bae554
build_options="gir"
if [ -z "$CROSS_BUILD" ]; then

4
srcpkgs/gnome-session/template
View file

@ -1,6 +1,6 @@
# Template file for 'gnome-session'
pkgname=gnome-session
version=3.22.3
version=3.24.0
revision=1
build_style=gnu-configure
configure_args="--disable-schemas-compile"
@ -15,7 +15,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.gnome.org"
license="GPL-2, LGPL-2.1"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=cc486fc84d892fa744a382b5ea8b9b40fc5045bc0d5feccfb02e80137eab77e5
checksum=87e380a54628f0e6e4506887c409ec0f99024e7840d614edfeeb511dea884d2c
pre_configure() {
sed -i "s/^#ifdef HAVE_SYSTEMD/#if 0/" \

4
srcpkgs/gnome-shell-extensions/template
View file

@ -1,6 +1,6 @@
# Template file for 'gnome-shell-extensions'
pkgname=gnome-shell-extensions
version=3.22.2
version=3.24.1
revision=1
noarch="yes"
build_style=gnu-configure
@ -13,4 +13,4 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://live.gnome.org/GnomeShell/Extensions"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=df7c22c69e29162bc1a7018b25b9a2fc37546451746b8b3c5109e5ac92238a87
checksum=f8008064e732f1b29d8343c43b2b5ca029411af33e47b32a4daed2cae5b9aa60

6
srcpkgs/gnome-shell/template
View file

@ -1,6 +1,6 @@
# Template file for 'gnome-shell'
pkgname=gnome-shell
version=3.22.3
version=3.24.1
revision=1
build_style=gnu-configure
configure_args="--disable-schemas-compile --disable-systemd"
@ -13,7 +13,7 @@ makedepends="
gjs-devel telepathy-logger-devel libcanberra-devel polkit-devel libcroco-devel
pulseaudio-devel libgudev-devel gst-plugins-base1-devel
caribou-devel gir-freedesktop gnome-control-center-devel
folks-devel gnome-menus-devel"
folks-devel gnome-menus-devel mozjs38-devel"
depends="caribou>=0.4.12 pulseaudio glxinfo desktop-file-utils
gir-freedesktop gnome-control-center>=3.16 elogind upower"
short_desc="GNOME core user interface"
@ -21,7 +21,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://live.gnome.org/GnomeShell"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=d1e6bd80ddd1fef92d80b518d4dbeffa296e8f003402551b8c37c42744b7d42f
checksum=53f93d64307a3c74dd9854a311a82d9ea9671dd424560f5a6f61dbf9474f423f
build_options="gir"
if [ -z "$CROSS_BUILD" ]; then

64
srcpkgs/gnome/template
View file

@ -1,67 +1,67 @@
# Template file for 'gnome'
pkgname=gnome
version=3.22.0
version=3.24.0
revision=1
build_style=meta
depends="
baobab>=${version}
bijiben>=3.20.2
brasero>=3.12.0
cantarell-fonts>=0.0.16
bijiben>=3.21.2
brasero>=3.12.1
cantarell-fonts>=0.0.25
cheese>=${version}
empathy>=3.12.10
eog>=3.16.0
empathy>=3.12.13
eog>=${version}
epiphany>=${version}
evince>=${version}
evolution>=${version}
file-roller>=3.16.0
gdm>=3.16.0
gedit>=${version}
glib>=2.46.0
file-roller>=${version}
gdm>=${version}
gedit>=3.22.0
glib>=2.52.0
gnome-backgrounds>=${version}
gnome-bluetooth>=3.20.1
gnome-calculator>=${version}
gnome-clocks>=${version}
gnome-color-manager>=3.18.0
gnome-contacts>=${version}
gnome-color-manager>=${version}
gnome-contacts>=3.22.1
gnome-desktop>=${version}
gnome-dictionary>=3.18.1
gnome-disk-utility>=3.18.3
gnome-documents>=3.18.0.0
gnome-font-viewer>=3.16.0
gnome-dictionary>=${version}
gnome-disk-utility>=${version}
gnome-documents>=${version}
gnome-font-viewer>=3.22.0
gnome-initial-setup>=${version}
gnome-keyring>=3.20.0
gnome-maps>=${version}
gnome-menus>=3.10.0
gnome-menus>=3.13.3
gnome-music>=${version}
gnome-online-miners>=3.14.0
gnome-online-miners>=3.22.0
gnome-photos>=${version}
gnome-screenshot>=${version}
gnome-screenshot>=3.22.0
gnome-session>=${version}
gnome-settings-daemon>=${version}
gnome-shell>=${version}
gnome-shell-extensions>=${version}
gnome-sound-recorder>=3.16.0
gnome-sound-recorder>=${version}
gnome-system-monitor>=${version}
gnome-terminal>=${version}
gnome-themes-standard>=${version}
gnome-user-docs>=${version}
gnome-weather>=3.20.2
gtk+3>=${version}
gucharmap>=${version}
gnome-user-docs>=3.22.0
gnome-weather>=${version}
gtk+3>=3.22.11
gucharmap>=9.0.3
mousetweaks>=3.12.0
nautilus>=${version}
nautilus-sendto>=3.8.0
network-manager-applet>=1.0.4
rygel>=0.28.0
nautilus-sendto>=3.8.4
network-manager-applet>=1.4.6
rygel>=0.34.0
seahorse>=3.20.0
sushi>=3.20.0
totem>=${version}
tracker>=1.6.0
vinagre>=${version}
vino>=${version}
xdg-user-dirs-gtk>=0.10
yelp>=${version}"
tracker>=1.12.0
vinagre>=3.22.0
vino>=3.22.0
xdg-user-dirs-gtk>=0.15
yelp>=3.22.0"
short_desc="The GNOME meta-package for Void Linux"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.gnome.org"

1
srcpkgs/mozjs38-devel Symbolic link
View file

@ -0,0 +1 @@
mozjs38

11
srcpkgs/mozjs38/patches/configure.patch Normal file
View file

@ -0,0 +1,11 @@
--- js/src/configure 2017-03-21 06:18:29.372463084 -0600
+++ js/src/configure 2017-03-21 06:27:37.546371605 -0600
@@ -15906,7 +15906,7 @@
fi
fi
- version=`sed -n 's/^[:space:]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
+ version=`sed -n 's/^[[:space:]]*#[[:space:]]*define[[:space:]][[:space:]]*U_ICU_VERSION_MAJOR_NUM[[:space:]][[:space:]]*\([0-9][0-9]*\)[[:space:]]*$/\1/p' "$icudir/common/unicode/uvernum.h"`
if test x"$version" = x; then
{ echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&2; echo "configure: error: cannot determine icu version number from uvernum.h header file $lineno" 1>&5; exit 1; }
fi

56
srcpkgs/mozjs38/template Normal file
View file

@ -0,0 +1,56 @@
# Template file for 'mozjs38'
pkgname=mozjs38
version=38.8.0
revision=1
wrksrc="mozilla-esr${version%.*.*}"
build_wrksrc="js/src"
build_style=gnu-configure
hostmakedepends="perl python"
makedepends="nspr-devel zlib-devel"
short_desc="Mozilla JavaScript interpreter and library (38.x series)"
homepage="http://www.mozilla.org/js/"
license="MPL-1.1, GPL-2, LGPL-2.1"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
distfiles="https://ftp.mozilla.org/pub/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.bz2"
checksum=9475adcee29d590383c4885bc5f958093791d1db4302d694a5d2766698f59982
nopie=yes
do_configure() {
local _args
if [ "$CROSS_BUILD" ]; then
export HOST_CFLAGS="-Os"
export HOST_CXXFLAGS="-Os"
_args+=" --target=$XBPS_CROSS_TRIPLET"
fi
SHELL=/bin/bash ./configure --prefix=/usr --enable-threadsafe \
--with-system-nspr ${_args}
}
post_install() {
# Rename pkgconfig
mv ${PKGDESTDIR}/usr/lib/pkgconfig/js.pc ${PKGDESTDIR}/usr/lib/pkgconfig/mozjs-${version%.*.*}.pc
# Remove links
mv ${PKGDESTDIR}/usr/include/mozjs-/js-config.h ${PKGDESTDIR}/usr/include/
rm -rf ${PKGDESTDIR}/usr/include/mozjs-/*
mv ${PKGDESTDIR}/usr/include/js-config.h ${PKGDESTDIR}/usr/include/mozjs-/
cp -p ${wrksrc}/js/src/js.msg ${PKGDESTDIR}/usr/include/mozjs-/
cp -p ${wrksrc}/js/src/*.h ${PKGDESTDIR}/usr/include/mozjs-/
mkdir ${PKGDESTDIR}/usr/include/mozjs-/js/
cp -p ${wrksrc}/js/public/*.h ${PKGDESTDIR}/usr/include/mozjs-/js/
mkdir ${PKGDESTDIR}/usr/include/mozjs-/mozilla/
cp -p ${wrksrc}/mfbt/*.h ${PKGDESTDIR}/usr/include/mozjs-/mozilla/
}
mozjs38-devel_package() {
depends="nspr-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
vmove usr/bin/js-config
vmove usr/include
vmove usr/lib/pkgconfig
}
}

1
srcpkgs/mozjs38/update Normal file
View file

@ -0,0 +1 @@
pkgname="mozjs"

10
srcpkgs/mutter/patches/fix-includes.patch
View file

@ -1,10 +0,0 @@
--- src/wayland/meta-wayland-private.h.orig 2016-09-23 08:55:17.876037227 +0200
+++ src/wayland/meta-wayland-private.h 2016-09-23 08:57:08.436042296 +0200
@@ -27,6 +27,7 @@
#include "window-private.h"
#include <meta/meta-cursor-tracker.h>
+#include <meta/meta-backend.h>
#include "meta-wayland.h"
#include "meta-wayland-versions.h"

17
srcpkgs/mutter/template
View file

@ -1,22 +1,21 @@
# Template file for 'mutter'
pkgname=mutter
version=3.22.3
version=3.24.1
revision=1
build_style=gnu-configure
configure_args="--disable-schemas-compile --disable-static --enable-compile-warnings=no"
# wayland is currently broken
configure_args+=" --disable-wayland"
configure_args="--disable-schemas-compile --disable-static --enable-egl-device"
hostmakedepends="pkg-config zenity glib-devel gobject-introspection"
makedepends="json-glib-devel upower-devel gnome-desktop-devel libinput-devel
glib-devel libcanberra-devel startup-notification-devel libSM-devel"
glib-devel libcanberra-devel startup-notification-devel libSM-devel libXtst-devel
elogind-devel libdrm-devel libinput-devel libgudev-devel"
depends="zenity desktop-file-utils"
short_desc="Lightweight GTK+3 window manager"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.gnome.org"
license="GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=537eda8e5fdd4a70602da913b885ad745a7510678c24006b91ceba83ccab209a
shlib_provides="libmutter-clutter-1.0.so libmutter-cogl-path.so libmutter-cogl.so libmutter-cogl-pango.so"
checksum=acaa77f9705cc6ca4a3d41935524ff31ba7a4c677bdd3e1d4662bbf3ece86a24
shlib_provides="libmutter-clutter-0.so libmutter-cogl-path-0.so libmutter-cogl-0.so libmutter-cogl-pango-0.so"
nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/1295/steps/shell_3/logs/stdio"
@ -33,8 +32,8 @@ pre_configure() {
CFLAGS+=" -I$i -I$i/uapi -I$i/../arch/$_arch/include"
done
#sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
#sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' cogl/libtool
#sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' clutter/libtool
#sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' cogl/libtool
#sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' clutter/libtool
}
mutter-devel_package() {

4
srcpkgs/totem/template
View file

@ -1,13 +1,13 @@
# Template file for 'totem'
pkgname=totem
version=3.22.1
version=3.24.0
revision=1
short_desc="A GNOME integrated movie player based on Gstreamer"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://www.gnome.org"
license="LGPL-2, GPL-2"
distfiles="${GNOME_SITE}/$pkgname/${version%.*}/$pkgname-$version.tar.xz"
checksum=10a509d7797b59cda57b324a426f77e567729545459a64afe4a5ac986bd7c53b
checksum=9bd78f7b940e886b5c809acdfe00a610a834de5080dd40272b92835528a58d01
build_style=gnu-configure
configure_args="--disable-static --disable-schemas-compile