Mercurial > vanilla
changeset 796:e693904f5e20
xfce: upgrade to 4.14
line wrap: on
line diff
--- a/CHANGES.md Mon Aug 12 20:54:37 2019 +0200 +++ b/CHANGES.md Mon Aug 12 17:04:49 2019 +0200 @@ -4,6 +4,13 @@ Vanilla Linux current ------------------------------ +### 2018-08-12 + +The Xfce desktop has been upgraded to 4.14, it no longer requires Gtk 2 and +support for this toolkit has been explicitly disabled. For consistency purposes, +deprecated packages that have not been updated for the 4.14 release were +removed. This includes orage and gtk-xfce-engine. + ### 2019-07-19 OpenSSL has been replaced by LibreSSL.
--- a/Templates/xfce.sh Mon Aug 12 20:54:37 2019 +0200 +++ b/Templates/xfce.sh Mon Aug 12 17:04:49 2019 +0200 @@ -19,8 +19,8 @@ PKGVERSION=1.0.0 PKGREVISION=1 PKGLICENSE="" -PKGSUMMARY="short summary" -PKGDOWNLOAD="http://archive.xfce.org/xfce/4.12/src/$PKGNAME-$PKGVERSION.tar.bz2" +PKGSUMMARY="Xfce short summary" +PKGDOWNLOAD="http://archive.xfce.org/xfce/${PKGVERSION%.*}/src/$PKGNAME-$PKGVERSION.tar.bz2" # PKGDEPENDS="category/foo category/bar" # PKGOPTIONS="FOO BAR BAZ" @@ -44,7 +44,9 @@ ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix= + --prefix= \ + --localedir=/share/locale \ + --with-locales-dir=/share/locale make make install DESTDIR=$DESTDIR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xfce/exo/exo-post.sh Mon Aug 12 17:04:49 2019 +0200 @@ -0,0 +1,20 @@ +#!/bin/sh +# +# Copyright (c) 2019 David Demelier <markand@malikania.fr> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# + +if [ -x /bin/gtk-update-icon-cache ]; then + /bin/gtk-update-icon-cache -fqt /share/icons/hicolor +fi
--- a/xfce/exo/exo.sh Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/exo/exo.sh Mon Aug 12 17:04:49 2019 +0200 @@ -16,13 +16,14 @@ # PKGNAME=exo -PKGVERSION=0.10.3 +PKGVERSION=0.12.8 PKGREVISION=1 PKGLICENSE="GPLv2 LGPLv21" PKGSUMMARY="Xfce extension library for application development" -PKGDOWNLOAD="http://archive.xfce.org/xfce/4.12/src/$PKGNAME-$PKGVERSION.tar.bz2" +PKGDOWNLOAD="http://archive.xfce.org/xfce/4.14/src/$PKGNAME-$PKGVERSION.tar.bz2" +PKGOPTIONS="INTROSPECTION NLS VALA" PKGDEPENDS="core/gettext:build - graphics/gtk2 + graphics/gtk lib/glib perl/perl perl/p5-uri @@ -34,6 +35,9 @@ : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${INTROSPECTION:=yes} +: ${NLS:=yes} +: ${VALA:=yes} build() { @@ -49,9 +53,13 @@ --prefix= \ --sysconfdir=/etc \ --localedir=/share/locale \ - --with-locales-dir=/share/locale + --with-locales-dir=/share/locale \ + $with_introspection \ + $with_nls \ + $with_vala make - make install DESTDIR=$DESTDIR itlocaledir=/share/locale + make install DESTDIR=$DESTDIR + rm -f $DESTDIR/lib/libexo-2.la rm -f $DESTDIR/lib/libexo-1.la cd ..
--- a/xfce/exo/exo.sha1 Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/exo/exo.sha1 Mon Aug 12 17:04:49 2019 +0200 @@ -1,1 +1,1 @@ -d625b1981da2f3c162643af5917ae342eeb8b90c exo-0.10.3.tar.bz2 +46c8c05cc87546750ab81c690bae58a37e7a1953 exo-0.12.8.tar.bz2
--- a/xfce/garcon/garcon.sh Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/garcon/garcon.sh Mon Aug 12 17:04:49 2019 +0200 @@ -16,12 +16,20 @@ # PKGNAME=garcon -PKGVERSION=0.4.0 +PKGVERSION=0.6.4 PKGREVISION=1 PKGLICENSE="LGPLv2 GFDLv11" PKGSUMMARY="Xfce freedesktop compliant menu implementation" -PKGDOWNLOAD="http://archive.xfce.org/xfce/4.12/src/$PKGNAME-$PKGVERSION.tar.bz2" -PKGDEPENDS="graphics/gtk2 lib/glib xfce/libxfce4ui xfce/libxfce4util" +PKGDOWNLOAD="http://archive.xfce.org/xfce/4.14/src/$PKGNAME-$PKGVERSION.tar.bz2" +PKGDEPENDS="desktop/libwnck + graphics/cairo + graphics/gtk + lib/glib + xfce/exo + xfce/libxfce4ui + xfce/libxfce4util + xfce/xfconf" +PKGOPTIONS="NLS" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -29,6 +37,14 @@ : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${NLS:=yes} + +if [ "$NLS" = "yes" ]; then + PKGDEPENDS="core/gettext:build $PKGDEPENDS" + with_nls="--enable-nls" +else + with_nls="--disable-nls" +fi build() { @@ -43,11 +59,14 @@ ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix= + --prefix= \ + --localedir=/share/locale \ + --with-locales-dir=/share/locale \ + --disable-gtk2 \ + $with_nls make make install DESTDIR=$DESTDIR - rm -f $DESTDIR/lib/libgarcon-gtk2-1.la - rm -f $DESTDIR/lib/libgarcon-1.la + rm -f $DESTDIR/lib/libgarcon*.la cd .. rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/garcon/garcon.sha1 Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/garcon/garcon.sha1 Mon Aug 12 17:04:49 2019 +0200 @@ -1,1 +1,1 @@ -9978c7f3181f7d8fd930cce74293d2a360743182 garcon-0.4.0.tar.bz2 +014f0b1699a56c1a0738238a07008a5b487892ad garcon-0.6.4.tar.bz2
--- a/xfce/gtk-xfce-engine/gtk-xfce-engine.sh Mon Aug 12 20:54:37 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2019 David Demelier <markand@malikania.fr> -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# - -PKGNAME=gtk-xfce-engine -PKGVERSION=2.10.0 -PKGREVISION=1 -PKGLICENSE="Xfce themes for Gtk+" -PKGSUMMARY="GPLv2" -PKGDOWNLOAD="http://archive.xfce.org/xfce/4.12/src/$PKGNAME-$PKGVERSION.tar.bz2" -PKGDEPENDS="graphics/gtk2 lib/glib" - -: ${CHOST:=$(uname -m)-linux-musl} -: ${CBUILD:=$(uname -m)-linux-musl} -: ${CC:=clang} -: ${CFLAGS:=-O2} -: ${LDFLAGS:=} -: ${LIBS:=} - -build() -{ - rm -rf $PKGNAME-$PKGVERSION - tar xvf $PKGNAME-$PKGVERSION.tar.bz2 - cd $PKGNAME-$PKGVERSION - - CC="$CC" \ - CFLAGS="$CFLAGS" \ - LDFLAGS="$LDFLAGS" \ - LIBS="$LIBS" \ - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix= - make - make install DESTDIR=$DESTDIR - rm -f $DESTDIR/lib/gtk-2.0/2.10.0/engines/libxfce.la - - cd .. - rm -rf $PKGNAME-$PKGVERSION -}
--- a/xfce/gtk-xfce-engine/gtk-xfce-engine.sha1 Mon Aug 12 20:54:37 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -4046ecd36886f4f7399a64230e516bd0e697448f gtk-xfce-engine-2.10.0.tar.bz2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xfce/libxfce4ui/libxfce4ui-post.sh Mon Aug 12 17:04:49 2019 +0200 @@ -0,0 +1,20 @@ +#!/bin/sh +# +# Copyright (c) 2019 David Demelier <markand@malikania.fr> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# + +if [ -x /bin/gtk-update-icon-cache ]; then + /bin/gtk-update-icon-cache -fqt /share/icons/hicolor +fi
--- a/xfce/libxfce4ui/libxfce4ui.sh Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/libxfce4ui/libxfce4ui.sh Mon Aug 12 17:04:49 2019 +0200 @@ -16,18 +16,18 @@ # PKGNAME=libxfce4ui -PKGVERSION=4.12.0 +PKGVERSION=4.14.1 PKGREVISION=1 PKGLICENSE="LGPLv20" PKGSUMMARY="Xfce user interface library" -PKGDOWNLOAD="http://archive.xfce.org/xfce/4.12/src/$PKGNAME-$PKGVERSION.tar.bz2" -PKGDEPENDS="graphics/gtk2 - graphics/gtk +PKGDOWNLOAD="http://archive.xfce.org/xfce/${PKGVERSION%.*}/src/$PKGNAME-$PKGVERSION.tar.bz2" +PKGDEPENDS="graphics/gtk lib/glib x11/libsm x11/libx11 xfce/libxfce4util xfce/xfconf" +PKGOPTIONS="INTROSPECTION NLS STARTUP VALA" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -35,6 +35,38 @@ : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${INTROSPECTION:=yes} +: ${NLS:=yes} +: ${STARTUP:=yes} +: ${VALA:=yes} + +if [ "$INTROSPECTION" = "yes" ]; then + PKGDEPENDS="dev/gobject-introspection:build $PKGDEPENDS" + with_introspection="--enable-introspection" +else + with_introspection="--disable-introspection" +fi + +if [ "$NLS" = "yes" ]; then + PKGDEPENDS="core/gettext:build $PKGDEPENDS" + with_nls="--enable-nls" +else + with_nls="--disable-nls" +fi + +if [ "$STARTUP" = "yes" ]; then + PKGDEPENDS="desktop/startup-notification $PKGDEPENDS" + with_startup="--enable-startup-notification" +else + with_startup="--disable-startup-notification" +fi + +if [ "$VALA" = "yes" ]; then + PKGDEPENDS="lang/vala $PKGDEPENDS" + with_vala="--enable-vala" +else + with_vala="--disable-vala" +fi build() { @@ -50,14 +82,16 @@ --build=$CBUILD \ --host=$CHOST \ --prefix= \ + --disable-gtk2 \ --localedir=/share/locale \ - --with-locales-dir=/share/locale + --with-locales-dir=/share/locale \ + $with_introspection \ + $with_nls \ + $with_vala make - make install DESTDIR=$DESTDIR itlocaledir=/share/locale - rm -f $DESTDIR/lib/libxfce4kbd-private-2.la + make install DESTDIR=$DESTDIR + rm -f $DESTDIR/lib/libxfce4ui-2.la rm -f $DESTDIR/lib/libxfce4kbd-private-3.la - rm -f $DESTDIR/lib/libxfce4ui-1.la - rm -f $DESTDIR/lib/libxfce4ui-2.la cd .. rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/libxfce4ui/libxfce4ui.sha1 Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/libxfce4ui/libxfce4ui.sha1 Mon Aug 12 17:04:49 2019 +0200 @@ -1,1 +1,1 @@ -6e91c9694d32dca5a8553bbf5c2ff70d82c51b57 libxfce4ui-4.12.0.tar.bz2 +5f8f80879de493f0478a5108be890cb869fb89d6 libxfce4ui-4.14.1.tar.bz2
--- a/xfce/libxfce4util/libxfce4util.sh Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/libxfce4util/libxfce4util.sh Mon Aug 12 17:04:49 2019 +0200 @@ -16,11 +16,12 @@ # PKGNAME=libxfce4util -PKGVERSION=4.12.1 +PKGVERSION=4.14.0 PKGREVISION=1 PKGLICENSE="LGPLv20" PKGSUMMARY="Xfce utility library" -PKGDOWNLOAD="http://archive.xfce.org/xfce/4.12/src/$PKGNAME-$PKGVERSION.tar.bz2" +PKGDOWNLOAD="http://archive.xfce.org/xfce/${PKGVERSION%.*}/src/$PKGNAME-$PKGVERSION.tar.bz2" +PKGOPTIONS="INTROSPECTION NLS VALA" PKGDEPENDS="lib/glib perl/perl:build" : ${CHOST:=$(uname -m)-linux-musl} @@ -29,7 +30,30 @@ : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${INTROSPECTION:=yes} : ${NLS:=yes} +: ${VALA:=yes} + +if [ "$INTROSPECTION" = "yes" ]; then + PKGDEPENDS="dev/gobject-introspection:build $PKGDEPENDS" + with_introspection="--enable-introspection" +else + with_introspection="--disable-introspection" +fi + +if [ "$NLS" = "yes" ]; then + PKGDEPENDS="core/gettext:build $PKGDEPENDS" + with_nls="--enable-nls" +else + with_nls="--disable-nls" +fi + +if [ "$VALA" = "yes" ]; then + PKGDEPENDS="lang/vala $PKGDEPENDS" + with_vala="--enable-vala" +else + with_vala="--disable-vala" +fi build() { @@ -45,10 +69,14 @@ --build=$CBUILD \ --host=$CHOST \ --prefix= \ + --sbindir=/bin \ --localedir=/share/locale \ - --with-locales-dir=/share/locale + --with-locales-dir=/share/locale \ + $with_introspection \ + $with_nls \ + $with_vala make - make install DESTDIR=$DESTDIR itlocaledir=/share/locale + make install DESTDIR=$DESTDIR rm -f $DESTDIR/lib/libxfce4util.la cd ..
--- a/xfce/libxfce4util/libxfce4util.sha1 Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/libxfce4util/libxfce4util.sha1 Mon Aug 12 17:04:49 2019 +0200 @@ -1,1 +1,1 @@ -fbea10b13db55c1f7756ec36ea7c8e84ca781492 libxfce4util-4.12.1.tar.bz2 +8aafc9765102f104e9366f341e9eabf38bd71a16 libxfce4util-4.14.0.tar.bz2
--- a/xfce/mousepad/mousepad.sh Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/mousepad/mousepad.sh Mon Aug 12 17:04:49 2019 +0200 @@ -16,7 +16,7 @@ # PKGNAME=mousepad -PKGVERSION=0.4.1 +PKGVERSION=0.4.2 PKGREVISION=1 PKGLICENSE="GPLv2" PKGSUMMARY="Xfce simple text editor" @@ -63,9 +63,10 @@ --prefix= \ --enable-gtk3 \ --localedir=/share/locale \ + --with-locales-dir=/share/locale \ $with_dbus make - make install localedir=/share/locale DESTDIR=$DESTDIR + make install DESTDIR=$DESTDIR cd .. rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/mousepad/mousepad.sha1 Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/mousepad/mousepad.sha1 Mon Aug 12 17:04:49 2019 +0200 @@ -1,1 +1,1 @@ -da034ac3711c273e71e0c2b194c12d72a9ca087a mousepad-0.4.1.tar.bz2 +26f0a2860973c4acd425dc8b5e7736ba6cb9a459 mousepad-0.4.2.tar.bz2
--- a/xfce/orage/orage.sh Mon Aug 12 20:54:37 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,93 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2019 David Demelier <markand@malikania.fr> -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# - -# TODO: add libical dependency. - -PKGNAME=orage -PKGVERSION=4.12.1 -PKGREVISION=1 -PKGLICENSE="GPLv2" -PKGSUMMARY="Xfce time-managing application" -PKGDOWNLOAD="http://archive.xfce.org/src/apps/$PKGNAME/${PKGVERSION%.*}/$PKGNAME-$PKGVERSION.tar.bz2" -PKGDEPENDS="graphics/gtk2 lib/popt perl/perl" -PKGOPTIONS="DBUS NLS NOTIFICATIONS XFCE" - -: ${CHOST:=$(uname -m)-linux-musl} -: ${CBUILD:=$(uname -m)-linux-musl} -: ${CC:=clang} -: ${CFLAGS:=-O2} -: ${LDFLAGS:=} -: ${LIBS:=} -: ${DBUS:=yes} -: ${NLS:=yes} -: ${NOTIFICATIONS:=yes} -: ${XFCE:=yes} - -if [ "$DBUS" = "yes" ]; then - PKGDEPENDS="lib/dbus-glib $PKGDEPENDS" - with_dbus="--enable-dbus" -else - with_dbus="--disable-dbus" -fi - -if [ "$NLS" = "yes" ]; then - PKGDEPENDS="core/gettext:build $PKGDEPENDS" - with_nls="--enable-nls" -else - with_nls="--disable-nls" -fi - -if [ "$NOTIFICATIONS" = "yes" ]; then - PKGDEPENDS="desktop/libnotify $PKGDEPENDS" - with_notifications="--enable-libnotify" -else - with_notifications="--disable-libnotify" -fi - -if [ "$XFCE" = "yes" ]; then - PKGDEPENDS="xfce/xfce4-panel $PKGDEPENDS" - with_xfce="--enable-xfce4panel" -else - with_xfce="--disable-xfce4panel" -fi - -build() -{ - rm -rf $PKGNAME-$PKGVERSION - tar xvf $PKGNAME-$PKGVERSION.tar.bz2 - cd $PKGNAME-$PKGVERSION - - CC="$CC" \ - CFLAGS="$CFLAGS" \ - LDFLAGS="$LDFLAGS" \ - LIBS="$LIBS" \ - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix= \ - --localedir=/share/locale \ - $with_dbus \ - $with_nls \ - $with_notifications \ - $with_xfce - make - make install itlocaledir=/share/locale DESTDIR=$DESTDIR - rm -f $DESTDIR/lib/xfce4/panel/plugins/liborageclock.la - - cd .. - rm -rf $PKGNAME-$PKGVERSION -}
--- a/xfce/orage/orage.sha1 Mon Aug 12 20:54:37 2019 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -c856ad30f7a17a732d5cc794ef90aedf98575699 orage-4.12.1.tar.bz2
--- a/xfce/parole/parole.sh Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/parole/parole.sh Mon Aug 12 17:04:49 2019 +0200 @@ -16,7 +16,7 @@ # PKGNAME=parole -PKGVERSION=1.0.3 +PKGVERSION=1.0.4 PKGREVISION=1 PKGLICENSE="GPLv2" PKGSUMMARY="Xfce simple multimedia player"
--- a/xfce/ristretto/ristretto.sh Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/ristretto/ristretto.sh Mon Aug 12 17:04:49 2019 +0200 @@ -16,20 +16,21 @@ # PKGNAME=ristretto -PKGVERSION=0.8.5 +PKGVERSION=0.10.0 PKGREVISION=1 PKGLICENSE="GPLv2" PKGSUMMARY="Xfce simple image viewer" PKGDOWNLOAD="http://archive.xfce.org/src/apps/$PKGNAME/${PKGVERSION%.*}/$PKGNAME-$PKGVERSION.tar.bz2" -PKGOPTIONS="NLS" -PKGDEPENDS="graphics/cairo - graphics/gtk2 +PKGDEPENDS="core/file + graphics/cairo + graphics/gtk graphics/libexif lib/glib x11/libx11 xfce/libxfce4ui xfce/libxfce4util xfce/xfconf" +PKGOPTIONS="NLS" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -62,9 +63,10 @@ --prefix= \ --disable-debug \ --localedir=/share/locale \ + --with-locales-dir=/share/locale \ $with_nls make - make install localedir=/share/locale DESTDIR=$DESTDIR + make install DESTDIR=$DESTDIR cd .. rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/ristretto/ristretto.sha1 Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/ristretto/ristretto.sha1 Mon Aug 12 17:04:49 2019 +0200 @@ -1,1 +1,1 @@ -15c6b2ff61340046f415afd17db37b237e83d1b7 ristretto-0.8.5.tar.bz2 +88f2a4fcb704892f1906ba365189160abc6da961 ristretto-0.10.0.tar.bz2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xfce/thunar/thunar-post.sh Mon Aug 12 17:04:49 2019 +0200 @@ -0,0 +1,20 @@ +#!/bin/sh +# +# Copyright (c) 2019 David Demelier <markand@malikania.fr> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# + +if [ -x /bin/gtk-update-icon-cache ]; then + /bin/gtk-update-icon-cache -fqt /share/icons/hicolor +fi
--- a/xfce/thunar/thunar.sh Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/thunar/thunar.sh Mon Aug 12 17:04:49 2019 +0200 @@ -16,13 +16,13 @@ # PKGNAME=thunar -PKGVERSION=1.6.6 +PKGVERSION=1.8.9 PKGREVISION=1 PKGLICENSE="GPLv2 LGPLv20" PKGSUMMARY="Xfce file manager" -PKGDOWNLOAD="http://archive.xfce.org/xfce/4.12/src/Thunar-$PKGVERSION.tar.bz2" +PKGDOWNLOAD="http://archive.xfce.org/xfce/4.14/src/Thunar-$PKGVERSION.tar.bz2" PKGDEPENDS="graphics/gdk-pixbuf - graphics/gtk2 + graphics/gtk lib/glib x11/libsm x11/libx11 @@ -30,7 +30,7 @@ xfce/libxfce4ui xfce/libxfce4util xfce/xfconf" -PKGOPTIONS="DBUS EXIF NLS NOTIFICATIONS PCRE STARTUP UDEV" +PKGOPTIONS="DBUS EXIF INTROSPECTION NLS NOTIFICATIONS PCRE STARTUP UDEV" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -40,6 +40,7 @@ : ${LIBS:=} : ${DBUS:=yes} : ${EXIF:=yes} +: ${INTROSPECTION:=yes} : ${NLS:=yes} : ${NOTIFICATIONS:=yes} : ${PCRE:=yes} @@ -60,6 +61,13 @@ with_exif="--disable-exif" fi +if [ "$INTROSPECTION" = "yes" ]; then + PKGDEPENDS="dev/gobject-introspection:build $PKGDEPENDS" + with_introspection="--enable-introspection" +else + with_introspection="--disable-introspection" +fi + if [ "$NLS" = "yes" ]; then PKGDEPENDS="core/gettext:build $PKGDEPENDS" with_nls="--enable-nls" @@ -109,9 +117,11 @@ --build=$CBUILD \ --host=$CHOST \ --prefix= \ + --localedir=/share/locale \ --with-locales-dir=/share/locale \ $with_dbus \ $with_exif \ + $with_introspection \ $with_nls \ $with_notifications \ $with_pcre \ @@ -119,6 +129,9 @@ $with_udev make make install DESTDIR=$DESTDIR + rm -f $DESTDIR/lib/xfce4/panel/plugins/libthunar-tpa.la + rm -f $DESTDIR/lib/thunarx-3/*.la + rm -f $DESTDIR/lib/libthunarx-3.la cd .. rm -rf Thunar-$PKGVERSION
--- a/xfce/thunar/thunar.sha1 Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/thunar/thunar.sha1 Mon Aug 12 17:04:49 2019 +0200 @@ -1,1 +1,1 @@ -9d7ba73376efa1ecb580b227cfc4fd29fe4b8ecb Thunar-1.6.6.tar.bz2 +7a9f00320c4046da868e6c37f0f5f8d8b7b0fba8 Thunar-1.8.9.tar.bz2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xfce/xfce4-panel/xfce4-panel-post.sh Mon Aug 12 17:04:49 2019 +0200 @@ -0,0 +1,20 @@ +#!/bin/sh +# +# Copyright (c) 2019 David Demelier <markand@malikania.fr> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# + +if [ -x /bin/gtk-update-icon-cache ]; then + /bin/gtk-update-icon-cache -fqt /share/icons/hicolor +fi
--- a/xfce/xfce4-panel/xfce4-panel.sh Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/xfce4-panel/xfce4-panel.sh Mon Aug 12 17:04:49 2019 +0200 @@ -16,22 +16,23 @@ # PKGNAME=xfce4-panel -PKGVERSION=4.12.0 +PKGVERSION=4.14.0 PKGREVISION=1 PKGLICENSE="GPLv2 LGPLv21" PKGSUMMARY="Xfce panel" -PKGDOWNLOAD="http://archive.xfce.org/xfce/4.12/src/$PKGNAME-$PKGVERSION.tar.bz2" +PKGDOWNLOAD="http://archive.xfce.org/xfce/${PKGVERSION%.*}/src/$PKGNAME-$PKGVERSION.tar.bz2" PKGDEPENDS="desktop/libwnck2 graphics/cairo - graphics/gtk2 graphics/gtk lib/dbus-glib lib/glib x11/libx11 + xfce/garcon xfce/exo xfce/libxfce4ui xfce/libxfce4util xfce/xfconf" +PKGOPTIONS="INTROSPECTION NLS VALA" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -39,6 +40,30 @@ : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${INTROSPECTION:=yes} +: ${NLS:=yes} +: ${VALA:=yes} + +if [ "$INTROSPECTION" = "yes" ]; then + PKGDEPENDS="dev/gobject-introspection:build $PKGDEPENDS" + with_introspection="--enable-introspection" +else + with_introspection="--disable-introspection" +fi + +if [ "$NLS" = "yes" ]; then + PKGDEPENDS="core/gettext:build $PKGDEPENDS" + with_nls="--enable-nls" +else + with_nls="--disable-nls" +fi + +if [ "$VALA" = "yes" ]; then + PKGDEPENDS="lang/vala $PKGDEPENDS" + with_vala="--enable-vala" +else + with_vala="--disable-vala" +fi build() { @@ -54,12 +79,14 @@ --build=$CBUILD \ --host=$CHOST \ --prefix= \ - --enable-gtk3 \ + --disable-gtk2 \ --localedir=/share/locale \ - --with-locales-dir=/share/locale + --with-locales-dir=/share/locale \ + $with_introspection \ + $with_nls \ + $with_vala make - make install DESTDIR=$DESTDIR itlocaledir=/share/locale - rm -f $DESTDIR/lib/libxfce4panel-*.la + make install DESTDIR=$DESTDIR rm -f $DESTDIR/lib/xfce4/panel/plugins/*.la cd ..
--- a/xfce/xfce4-panel/xfce4-panel.sha1 Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/xfce4-panel/xfce4-panel.sha1 Mon Aug 12 17:04:49 2019 +0200 @@ -1,1 +1,1 @@ -5f0e51c7948bc4e3c46cad93ee772573a23efbc1 xfce4-panel-4.12.0.tar.bz2 +400b499b2c4d02302e2e6df2885c1dc4e0c53509 xfce4-panel-4.14.0.tar.bz2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xfce/xfce4-session/xfce4-session-post.sh Mon Aug 12 17:04:49 2019 +0200 @@ -0,0 +1,20 @@ +#!/bin/sh +# +# Copyright (c) 2019 David Demelier <markand@malikania.fr> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# + +if [ -x /bin/gtk-update-icon-cache ]; then + /bin/gtk-update-icon-cache -fqt /share/icons/hicolor +fi
--- a/xfce/xfce4-session/xfce4-session.sh Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/xfce4-session/xfce4-session.sh Mon Aug 12 17:04:49 2019 +0200 @@ -16,14 +16,13 @@ # PKGNAME=xfce4-session -PKGVERSION=4.12.0 +PKGVERSION=4.14.0 PKGREVISION=1 PKGLICENSE="GPLv2" PKGSUMMARY="Xfce session manager" -PKGDOWNLOAD="http://archive.xfce.org/xfce/4.12/src/$PKGNAME-$PKGVERSION.tar.bz2" +PKGDOWNLOAD="http://archive.xfce.org/xfce/${PKGVERSION%.*}/src/$PKGNAME-$PKGVERSION.tar.bz2" PKGDEPENDS="core/which - desktop/libwnck2 - lib/dbus-glib + desktop/libwnck lib/glib network/dbus x11/iceauth @@ -32,15 +31,22 @@ xfce/libxfce4ui xfce/libxfce4util xfce/xfconf" -PKGOPTIONS="POLKIT UPOWER" - +PKGOPTIONS="NLS POLKIT UPOWER" : ${CC:=clang} : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${NLS:=yes} : ${POLKIT:=yes} -: ${UPOWER:=yes} +: ${UPOWER:=no} # TODO: set to yes once we have upower + +if [ "$NLS" = "yes" ]; then + PKGDEPENDS="core/gettext:build $PKGDEPENDS" + with_nls="--enable-nls" +else + with_nls="--disable-nls" +fi if [ "$POLKIT" = "yes" ]; then PKGDEPENDS="security/polkit $PKGDEPENDS" @@ -70,13 +76,11 @@ --prefix= \ --localedir=/share/locale \ --with-locales-dir=/share/locale \ + $with_nls \ $with_polkit \ $with_upower make - make install DESTDIR=$DESTDIR itlocaledir=/share/locale - rm -f $DESTDIR/lib/libxfsm-4.6.la - rm -f $DESTDIR/lib/xfce4/session/splash-engines/*.la - + make install DESTDIR=$DESTDIR cd .. rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfce4-session/xfce4-session.sha1 Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/xfce4-session/xfce4-session.sha1 Mon Aug 12 17:04:49 2019 +0200 @@ -1,1 +1,1 @@ -c5785f863682f3173100f90946d558f1ebb6df98 xfce4-session-4.12.0.tar.bz2 +8f3e224c1bd82c172f59f58bbe89aea347f99d7a xfce4-session-4.14.0.tar.bz2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xfce/xfce4-settings/xfce4-settings-post.sh Mon Aug 12 17:04:49 2019 +0200 @@ -0,0 +1,20 @@ +#!/bin/sh +# +# Copyright (c) 2019 David Demelier <markand@malikania.fr> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# + +if [ -x /bin/gtk-update-icon-cache ]; then + /bin/gtk-update-icon-cache -fqt /share/icons/hicolor +fi
--- a/xfce/xfce4-settings/xfce4-settings.sh Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/xfce4-settings/xfce4-settings.sh Mon Aug 12 17:04:49 2019 +0200 @@ -15,15 +15,16 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # +# TODO: add COLORD, UPOWER option + PKGNAME=xfce4-settings -PKGVERSION=4.12.0 +PKGVERSION=4.14.0 PKGREVISION=1 PKGLICENSE="GPLv2" PKGSUMMARY="Xfce settings manager" -PKGDOWNLOAD="http://archive.xfce.org/xfce/4.12/src/$PKGNAME-$PKGVERSION.tar.bz2" +PKGDOWNLOAD="http://archive.xfce.org/xfce/${PKGVERSION%.*}/src/$PKGNAME-$PKGVERSION.tar.bz2" PKGDEPENDS="fonts/fontconfig - graphics/gtk2 - lib/dbus-glib + graphics/gtk lib/glib lib/libxklavier x11/libx11 @@ -36,6 +37,7 @@ xfce/libxfce4ui xfce/libxfce4util xfce/xfconf" +PKGOPTIONS="NLS NOTIFICATIONS" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -43,6 +45,22 @@ : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${NLS:=yes} +: ${NOTIFICATIONS:=yes} + +if [ "$NLS" = "yes" ]; then + PKGDEPENDS="core/gettext:build $PKGDEPENDS" + with_nls="--enable-nls" +else + with_nls="--disable-nls" +fi + +if [ "$NOTIFICATIONS" = "yes" ]; then + PKGDEPENDS="desktop/libnotify $PKGDEPENDS" + with_notifications="--enable-libnotify" +else + with_notifications="--disable-libnotify" +fi build() { @@ -59,9 +77,11 @@ --host=$CHOST \ --prefix= \ --localedir=/share/locale \ - --with-locales-dir=/share/locale + --with-locales-dir=/share/locale \ + $with_nls \ + $with_notifications make - make install DESTDIR=$DESTDIR itlocaledir=/share/locale + make install DESTDIR=$DESTDIR cd .. rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfce4-settings/xfce4-settings.sha1 Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/xfce4-settings/xfce4-settings.sha1 Mon Aug 12 17:04:49 2019 +0200 @@ -1,1 +1,1 @@ -507a66ed160e44078f81051878c8644d5a5f344e xfce4-settings-4.12.0.tar.bz2 +8240e44f24fce635e02c3c80039c5d0ed67f3758 xfce4-settings-4.14.0.tar.bz2
--- a/xfce/xfce4-terminal/xfce4-terminal.sh Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/xfce4-terminal/xfce4-terminal.sh Mon Aug 12 17:04:49 2019 +0200 @@ -21,13 +21,13 @@ PKGLICENSE="GPLv2" PKGSUMMARY="Xfce simple multimedia player" PKGDOWNLOAD="http://archive.xfce.org/src/apps/$PKGNAME/${PKGVERSION%.*}/$PKGNAME-$PKGVERSION.tar.bz2" -PKGOPTIONS="NLS" PKGDEPENDS="graphics/gtk graphics/vte lib/glib x11/libx11 xfce/libxfce4ui xfce/xfconf" +PKGOPTIONS="NLS" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -60,10 +60,10 @@ --prefix= \ --disable-debug \ --localedir=/share/locale \ + --with-locales-dir=/share/locale \ $with_nls make - make install localedir=/share/locale DESTDIR=$DESTDIR - rm -f $DESTDIR/lib/parole-0/*.la + make install DESTDIR=$DESTDIR cd .. rm -rf $PKGNAME-$PKGVERSION
--- a/xfce/xfconf/xfconf.sh Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/xfconf/xfconf.sh Mon Aug 12 17:04:49 2019 +0200 @@ -16,13 +16,12 @@ # PKGNAME=xfconf -PKGVERSION=4.12.0 +PKGVERSION=4.14.1 PKGREVISION=1 PKGLICENSE="GPLv2" PKGSUMMARY="D-Bus based configuration daemon and library for xfce" -PKGDOWNLOAD="http://archive.xfce.org/xfce/4.12/src/$PKGNAME-$PKGVERSION.tar.bz2" +PKGDOWNLOAD="http://archive.xfce.org/xfce/${PKGVERSION%.*}/src/$PKGNAME-$PKGVERSION.tar.bz2" PKGDEPENDS="network/dbus - lib/dbus-glib lib/glib xfce/libxfce4util" @@ -32,6 +31,38 @@ : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${INTROSPECTION:=yes} +: ${NLS:=yes} +: ${STARTUP:=yes} +: ${VALA:=yes} + +if [ "$INTROSPECTION" = "yes" ]; then + PKGDEPENDS="dev/gobject-introspection:build $PKGDEPENDS" + with_introspection="--enable-introspection" +else + with_introspection="--disable-introspection" +fi + +if [ "$NLS" = "yes" ]; then + PKGDEPENDS="core/gettext:build $PKGDEPENDS" + with_nls="--enable-nls" +else + with_nls="--disable-nls" +fi + +if [ "$STARTUP" = "yes" ]; then + PKGDEPENDS="desktop/startup-notification $PKGDEPENDS" + with_startup="--enable-startup-notification" +else + with_startup="--disable-startup-notification" +fi + +if [ "$VALA" = "yes" ]; then + PKGDEPENDS="lang/vala $PKGDEPENDS" + with_vala="--enable-vala" +else + with_vala="--disable-vala" +fi build() { @@ -48,9 +79,12 @@ --host=$CHOST \ --prefix= \ --localedir=/share/locale \ - --with-locales-dir=/share/locale + --with-locales-dir=/share/locale \ + $with_introspection \ + $with_nls \ + $with_vala make - make install DESTDIR=$DESTDIR itlocaledir=/share/locale + make install DESTDIR=$DESTDIR rm -f $DESTDIR/lib/libxfconf-0.la cd ..
--- a/xfce/xfconf/xfconf.sha1 Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/xfconf/xfconf.sha1 Mon Aug 12 17:04:49 2019 +0200 @@ -1,1 +1,1 @@ -453b1589f242f293c193b0432accd8888964c3ab xfconf-4.12.0.tar.bz2 +edfa24dd862bc39d6002f40f6b9b3974c59fa250 xfconf-4.14.1.tar.bz2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xfce/xfdesktop/xfdesktop-post.sh Mon Aug 12 17:04:49 2019 +0200 @@ -0,0 +1,20 @@ +#!/bin/sh +# +# Copyright (c) 2019 David Demelier <markand@malikania.fr> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# + +if [ -x /bin/gtk-update-icon-cache ]; then + /bin/gtk-update-icon-cache -fqt /share/icons/hicolor +fi
--- a/xfce/xfdesktop/xfdesktop.sh Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/xfdesktop/xfdesktop.sh Mon Aug 12 17:04:49 2019 +0200 @@ -16,20 +16,20 @@ # PKGNAME=xfdesktop -PKGVERSION=4.12.0 +PKGVERSION=4.14.1 PKGREVISION=1 PKGLICENSE="GPLv2" PKGSUMMARY="Xfce desktop" -PKGDOWNLOAD="http://archive.xfce.org/xfce/4.12/src/$PKGNAME-$PKGVERSION.tar.bz2" -PKGDEPENDS="dev/intltool:build +PKGDOWNLOAD="http://archive.xfce.org/xfce/${PKGVERSION%.*}/src/$PKGNAME-$PKGVERSION.tar.bz2" +PKGDEPENDS="desktop/libwnck + dev/intltool:build graphics/cairo - graphics/gtk2 - lib/dbus-glib xfce/exo xfce/garcon xfce/libxfce4util xfce/libxfce4ui xfce/xfconf" +PKGOPTIONS="NLS NOTIFICATIONS" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -37,6 +37,22 @@ : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${NLS:=yes} +: ${NOTIFICATIONS:=yes} + +if [ "$NLS" = "yes" ]; then + PKGDEPENDS="core/gettext:build $PKGDEPENDS" + with_nls="--enable-nls" +else + with_nls="--disable-nls" +fi + +if [ "$NOTIFICATIONS" = "yes" ]; then + PKGDEPENDS="desktop/libnotify $PKGDEPENDS" + with_notifications="--enable-notifications" +else + with_notifications="--disable-notifications" +fi build() { @@ -53,7 +69,9 @@ --host=$CHOST \ --prefix= \ --localedir=/share/locale \ - --with-locales-dir=/share/locale + --with-locales-dir=/share/locale \ + $with_nls \ + $with_notifications make make install DESTDIR=$DESTDIR
--- a/xfce/xfdesktop/xfdesktop.sha1 Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/xfdesktop/xfdesktop.sha1 Mon Aug 12 17:04:49 2019 +0200 @@ -1,1 +1,1 @@ -9e234072a71fd377755ddcc7a53576a12f10d826 xfdesktop-4.12.0.tar.bz2 +2332b02c131d5ced61bf6276deef23d69bf852c6 xfdesktop-4.14.1.tar.bz2
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/xfce/xfwm4/xfwm4-post.sh Mon Aug 12 17:04:49 2019 +0200 @@ -0,0 +1,20 @@ +#!/bin/sh +# +# Copyright (c) 2019 David Demelier <markand@malikania.fr> +# +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# + +if [ -x /bin/gtk-update-icon-cache ]; then + /bin/gtk-update-icon-cache -fqt /share/icons/hicolor +fi
--- a/xfce/xfwm4/xfwm4.sh Mon Aug 12 20:54:37 2019 +0200 +++ b/xfce/xfwm4/xfwm4.sh Mon Aug 12 17:04:49 2019 +0200 @@ -16,26 +16,28 @@ # PKGNAME=xfwm4 -PKGVERSION=4.12.0 +PKGVERSION=4.14.0 PKGREVISION=1 PKGLICENSE="GPLv2" PKGSUMMARY="Xfce window manager" -PKGDOWNLOAD="http://archive.xfce.org/xfce/4.12/src/$PKGNAME-$PKGVERSION.tar.bz2" +PKGDOWNLOAD="http://archive.xfce.org/xfce/${PKGVERSION%.*}/src/$PKGNAME-$PKGVERSION.tar.bz2" PKGDEPENDS="network/dbus - desktop/libwnck2 - desktop/startup-notification + desktop/libwnck + graphics/gtk graphics/libdrm - graphics/gtk2 - lib/dbus-glib + graphics/libepoxy x11/libsm x11/libx11 x11/libxcomposite x11/libxext + x11/libxi + x11/libxinerama x11/libxrandr x11/libxrender xfce/libxfce4ui xfce/libxfce4util xfce/xfconf" +PKGOPTIONS="NLS STARTUP" : ${CHOST:=$(uname -m)-linux-musl} : ${CBUILD:=$(uname -m)-linux-musl} @@ -43,6 +45,22 @@ : ${CFLAGS:=-O2} : ${LDFLAGS:=} : ${LIBS:=} +: ${NLS:=yes} +: ${STARTUP:=yes} + +if [ "$NLS" = "yes" ]; then + PKGDEPENDS="core/gettext:build $PKGDEPENDS" + with_nls="--enable-nls" +else + with_nls="--disable-nls" +fi + +if [ "$STARTUP" = "yes" ]; then + PKGDEPENDS="desktop/startup-notification $PKGDEPENDS" + with_startup="--enable-startup-notification" +else + with_startup="--disable-startup-notification" +fi build() { @@ -57,9 +75,13 @@ ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix= + --prefix= \ + --localedir=/share/locale \ + --with-locales-dir=/share/locale \ + $with_nls \ + $with_startup make - make install DESTDIR=$DESTDIR itlocaledir=/share/locale + make install DESTDIR=$DESTDIR cd .. rm -rf $PKGNAME-$PKGVERSION