diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2015-05-22 14:03:19 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2015-05-22 14:03:19 +0000 |
| commit | d2d15bde865e43e9b016873973a9651904786142 (patch) | |
| tree | 921232c7ac140dd8cd8d98b5182d85897bae9711 /testing | |
| parent | 99f0ca5da557b04cacfc0b5960de8051d1da503a (diff) | |
| download | aports-d2d15bde865e43e9b016873973a9651904786142.tar.bz2 aports-d2d15bde865e43e9b016873973a9651904786142.tar.xz | |
testing/trayer: added patch from debian
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/trayer/APKBUILD | 16 | ||||
| -rw-r--r-- | testing/trayer/makefile.patch | 23 |
2 files changed, 33 insertions, 6 deletions
diff --git a/testing/trayer/APKBUILD b/testing/trayer/APKBUILD index eed2650541..96512d062a 100644 --- a/testing/trayer/APKBUILD +++ b/testing/trayer/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=trayer pkgver=1.0 -pkgrel=0 +pkgrel=1 pkgdesc="A lightweight GTK2-based systray" url="https://gna.org/projects/fvwm-crystal/" arch="all" @@ -12,7 +12,8 @@ depends_dev="libxmu-dev gtk+2.0-dev" makedepends="$depends_dev" install="" subpackages="$pkgname-doc" -source="http://download.gna.org/fvwm-crystal/trayer/${pkgver}/${pkgname}-${pkgver}.tar.gz" +source="http://download.gna.org/fvwm-crystal/trayer/${pkgver}/${pkgname}-${pkgver}.tar.gz + makefile.patch" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -20,7 +21,7 @@ prepare() { cd "$_builddir" for i in $source; do case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + *.patch) msg $i; patch -i "$srcdir"/$i || return 1;; esac done sed -i 's/$(LIBS) $(OBJ) $(SYSTRAYOBJ)/$(OBJ) $(SYSTRAYOBJ) $(LIBS) -lX11/' Makefile @@ -37,6 +38,9 @@ package() { install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -md5sums="e1b0b6464f991f2c296561e377585867 trayer-1.0.tar.gz" -sha256sums="64f3b7040a7a563ca4b6924efd950f10c928af7f3535b6f4a00f8bbe0b19484d trayer-1.0.tar.gz" -sha512sums="9903a78a1c185515e87552732449937daa23187d54a3ccbf19bc9fc569d6a440600c879fe78edbea3eff6b66a1f3fc5054d474dfeaca53af3521a6f18b454049 trayer-1.0.tar.gz" +md5sums="e1b0b6464f991f2c296561e377585867 trayer-1.0.tar.gz +5c1ca3b37ddcbc121a14fcc58406ae5f makefile.patch" +sha256sums="64f3b7040a7a563ca4b6924efd950f10c928af7f3535b6f4a00f8bbe0b19484d trayer-1.0.tar.gz +d5891d4eaaec101759c3604bae9974693add7ec89b954acce3230514d4110f4f makefile.patch" +sha512sums="9903a78a1c185515e87552732449937daa23187d54a3ccbf19bc9fc569d6a440600c879fe78edbea3eff6b66a1f3fc5054d474dfeaca53af3521a6f18b454049 trayer-1.0.tar.gz +e5147767263a6642c1f1cd79bbffadc950e581fba088e8dc8487aa4f8ea8c035b8fc19a02f19fdf83fad01e7e3e09df5238c99ad962a1cf24ad0d41b33ccdb8c makefile.patch" diff --git a/testing/trayer/makefile.patch b/testing/trayer/makefile.patch new file mode 100644 index 0000000000..52981b34fa --- /dev/null +++ b/testing/trayer/makefile.patch @@ -0,0 +1,23 @@ + # This patchfile was courtesy of the Debian team. Thanks! +--- Makefile.common ++++ Makefile.common~ +@@ -25,7 +25,7 @@ + endif + + # -DGTK_DISABLE_DEPRECATED does not work yet +-CFLAGS += -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED ++CFLAGS += -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED + + %.o: %.c + $(CC) $(CFLAGS) $(INCS) -c $< +--- panel.c ++++ panel.c~ +@@ -588,7 +588,6 @@ + printf(" --height <number>\n"); + printf(" --SetDockType <true|false>\n"); + printf(" --SetPartialStrut <true|false>\n"); +- printf(" --RoundCorners <true|false>\n"); + printf(" --transparent <true|false>\n"); + printf(" --alpha <number>\n"); + printf(" --tint <int>\n"); + |