[arch-commits] Commit in mldonkey/trunk (PKGBUILD lablgtk-2.14.2.patch)

[Balló György]

    Date: Friday, June 5, 2020 @ 18:55:00
  Author: bgyorgy
Revision: 639186

upgpkg: mldonkey 3.1.6-4: Fix build, install icons properly

Added:
  mldonkey/trunk/lablgtk-2.14.2.patch
Modified:
  mldonkey/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   16 ++++++++++------
 lablgtk-2.14.2.patch |   10 ++++++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-05 18:44:17 UTC (rev 639185)
+++ PKGBUILD	2020-06-05 18:55:00 UTC (rev 639186)
@@ -2,12 +2,12 @@
 
 pkgname=mldonkey
 pkgver=3.1.6
-pkgrel=3
+pkgrel=4
 pkgdesc='A multi-network P2P client'
 arch=(x86_64)
 url='http://mldonkey.sourceforge.net/'
 license=(GPL)
-depends=(file gd miniupnpc libnatpmp libminiupnpc.so)
+depends=(file gd hicolor-icon-theme miniupnpc libnatpmp libminiupnpc.so)
 makedepends=(gtk2 librsvg) # we build our own version of ocaml and lablgtk2
 optdepends=('librsvg: GUI support'
             'gtk2: GUI support')
@@ -19,7 +19,8 @@
         mldonkey.tmpfiles
         mldonkey.sysusers
         https://caml.inria.fr/distrib/ocaml-3.12/ocaml-3.12.0.tar.gz
-        https://forge.ocamlcore.org/frs/download.php/561/lablgtk-2.14.2.tar.gz)
+        https://forge.ocamlcore.org/frs/download.php/561/lablgtk-2.14.2.tar.gz
+        lablgtk-2.14.2.patch)
 sha256sums=('1b36b57c05a83c2e363c085bf8e80630884c6c92ecdeffc1ad5e1c39a98e043d'
             'SKIP'
             '1b36b57c05a83c2e363c085bf8e80630884c6c92ecdeffc1ad5e1c39a98e043d'
@@ -28,13 +29,14 @@
             '9c78fbfbba4f8286e2c2299e4da6f76d0f34f33fde26964922707c34fb75157b'
             '24d7ef8f6af93a8d87a82842b0ed796e35ce2f88d81734d9275eede8f4e10fba'
             'd964b385e110c1517c9de1c6331476d5e7a3585cc692b6b6b8973f3a9be7da4b'
-            '4981abedabdc462303f345104042c88af227ccd50fd30a9bf48fd353ab02d0ba')
+            '4981abedabdc462303f345104042c88af227ccd50fd30a9bf48fd353ab02d0ba'
+            '465895fadd4f370578c3c0263877d04d8fabaa7b9e5df69281f4b02fedd654f3')
 validpgpkeys=(A34C49DD3DB8B78DFAEBE0FA6346B945708D5A0C)
 
 build() {
   cd mldonkey-$pkgver
   # mldonkey hardcodes its dependencies to some specific version
-  ln -s "$srcdir"/ocaml-3.12.0.tar.gz "$srcdir"/lablgtk-2.14.2.tar.gz patches/
+  ln -s "$srcdir"/ocaml-3.12.0.tar.gz "$srcdir"/lablgtk-2.14.2.tar.gz "$srcdir"/lablgtk-2.14.2.patch patches/
   ./configure --prefix=/usr --enable-gui=newgui2 --enable-upnp-natpmp --enable-batch
   make
 }
@@ -43,7 +45,9 @@
   cd mldonkey-$pkgver
   make DESTDIR="$pkgdir" install
 
-  install -Dm644 icons/rsvg/type_source_normal.svg "$pkgdir"/usr/share/icons/mldonkey.svg
+  install -Dm644 packages/rpm/mldonkey-icon-16.png "$pkgdir"/usr/share/icons/hicolor/16x16/apps/mldonkey.png
+  install -Dm644 packages/rpm/mldonkey-icon-32.png "$pkgdir"/usr/share/icons/hicolor/32x32/apps/mldonkey.png
+  install -Dm644 packages/rpm/mldonkey-icon-48.png "$pkgdir"/usr/share/icons/hicolor/48x48/apps/mldonkey.png
   install -Dm644 distrib/mldonkey.desktop "$pkgdir"/usr/share/applications/mldonkey.desktop
 
   install -Dm644 "$srcdir"/mldonkey.conf "$pkgdir"/etc/conf.d/mldonkey

Added: lablgtk-2.14.2.patch
===================================================================
--- lablgtk-2.14.2.patch	                        (rev 0)
+++ lablgtk-2.14.2.patch	2020-06-05 18:55:00 UTC (rev 639186)
@@ -0,0 +1,10 @@
+--- src/Makefile.sic	2020-01-23 15:38:11.000000000 +0100
++++ src/Makefile	.2020-05-17 13:03:30.869429005 +0200
+@@ -17,6 +17,7 @@
+ DLLDIR = $(LIBDIR)/stublibs
+ 
+ include $(CONFIG)
++GTKCFLAGS += -fcommon
+ 
+ TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE)
+