[arch-commits] Commit in mldonkey/trunk (PKGBUILD lablgtk-2.14.2.patch)
Date: Friday, June 26, 2020 @ 09:31:17
Author: arojas
Revision: 653766
Update to 3.1.7, use system ocaml
Modified:
mldonkey/trunk/PKGBUILD
Deleted:
mldonkey/trunk/lablgtk-2.14.2.patch
--+
PKGBUILD | 22 ++
lablgtk-2.14.2.patch | 10 --
2 files changed, 6 insertions(+), 26 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-06-26 09:20:09 UTC (rev 653765)
+++ PKGBUILD2020-06-26 09:31:17 UTC (rev 653766)
@@ -1,42 +1,32 @@
# Maintainer: Anatol Pomozov
pkgname=mldonkey
-pkgver=3.1.6
-pkgrel=4
+pkgver=3.1.7
+pkgrel=1
pkgdesc='A multi-network P2P client'
arch=(x86_64)
url='http://mldonkey.sourceforge.net/'
license=(GPL)
depends=(file gd hicolor-icon-theme miniupnpc libnatpmp libminiupnpc.so)
-makedepends=(gtk2 librsvg) # we build our own version of ocaml and lablgtk2
+makedepends=(gtk2 librsvg ocaml-num camlp4 lablgtk2)
optdepends=('librsvg: GUI support'
'gtk2: GUI support')
backup=(etc/conf.d/mldonkey)
source=(https://github.com/ygrek/mldonkey/releases/download/release-${pkgver//./-}/mldonkey-$pkgver.tar.bz2{,.asc}
-
https://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2
mldonkey.conf
mldonkey.service
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
-lablgtk-2.14.2.patch)
-sha256sums=('1b36b57c05a83c2e363c085bf8e80630884c6c92ecdeffc1ad5e1c39a98e043d'
+mldonkey.sysusers)
+sha256sums=('cfdd69a4f4db0dff704aab9dde27f9bac4836ad593f8393700f8ed7970ca5106'
'SKIP'
-'1b36b57c05a83c2e363c085bf8e80630884c6c92ecdeffc1ad5e1c39a98e043d'
'f1d9401cefd591662d49011c53fdb2788755a6f745a963e46d8037b990edeb6a'
'778cebe8edcffd63db3594054c2daa62ce571644a96ad235b8c95470b55c0415'
'9c78fbfbba4f8286e2c2299e4da6f76d0f34f33fde26964922707c34fb75157b'
-'24d7ef8f6af93a8d87a82842b0ed796e35ce2f88d81734d9275eede8f4e10fba'
-'d964b385e110c1517c9de1c6331476d5e7a3585cc692b6b6b8973f3a9be7da4b'
-'4981abedabdc462303f345104042c88af227ccd50fd30a9bf48fd353ab02d0ba'
-'465895fadd4f370578c3c0263877d04d8fabaa7b9e5df69281f4b02fedd654f3')
+'24d7ef8f6af93a8d87a82842b0ed796e35ce2f88d81734d9275eede8f4e10fba')
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
"$srcdir"/lablgtk-2.14.2.patch patches/
./configure --prefix=/usr --enable-gui=newgui2 --enable-upnp-natpmp
--enable-batch
make
}
Deleted: lablgtk-2.14.2.patch
===
--- lablgtk-2.14.2.patch2020-06-26 09:20:09 UTC (rev 653765)
+++ lablgtk-2.14.2.patch2020-06-26 09:31:17 UTC (rev 653766)
@@ -1,10 +0,0 @@
src/Makefile.sic 2020-01-23 15:38:11.0 +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)
-
[arch-commits] Commit in mldonkey/trunk (PKGBUILD lablgtk-2.14.2.patch)
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
===
--- PKGBUILD2020-06-05 18:44:17 UTC (rev 639185)
+++ PKGBUILD2020-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.patch2020-06-05 18:55:00 UTC (rev 639186)
@@ -0,0 +1,10 @@
+--- src/Makefile.sic 2020-01-23 15:38:11.0 +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)
+
[arch-commits] Commit in mldonkey/trunk (PKGBUILD)
Date: Thursday, May 7, 2020 @ 02:07:13 Author: anatolik Revision: 625231 Buildinfo Format 1 rebuild https://www.archlinux.org/todo/buildinfo-format-1-rebuild/ Modified: mldonkey/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-05-07 01:16:59 UTC (rev 625230) +++ PKGBUILD2020-05-07 02:07:13 UTC (rev 625231) @@ -2,7 +2,7 @@ pkgname=mldonkey pkgver=3.1.6 -pkgrel=2 +pkgrel=3 pkgdesc='A multi-network P2P client' arch=(x86_64) url='http://mldonkey.sourceforge.net/'
[arch-commits] Commit in mldonkey/trunk (PKGBUILD)
Date: Tuesday, September 17, 2019 @ 00:20:55
Author: anatolik
Revision: 510955
Use https for the source files
Modified:
mldonkey/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-09-17 00:19:16 UTC (rev 510954)
+++ PKGBUILD2019-09-17 00:20:55 UTC (rev 510955)
@@ -13,12 +13,12 @@
'gtk2: GUI support')
backup=(etc/conf.d/mldonkey)
source=(https://github.com/ygrek/mldonkey/releases/download/release-${pkgver//./-}/mldonkey-$pkgver.tar.bz2{,.asc}
-http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2
+
https://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2
mldonkey.conf
mldonkey.service
mldonkey.tmpfiles
mldonkey.sysusers
-http://caml.inria.fr/distrib/ocaml-3.12/ocaml-3.12.0.tar.gz
+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)
sha256sums=('1b36b57c05a83c2e363c085bf8e80630884c6c92ecdeffc1ad5e1c39a98e043d'
'SKIP'
[arch-commits] Commit in mldonkey/trunk (PKGBUILD)
Date: Saturday, April 7, 2018 @ 20:58:23
Author: anthraxx
Revision: 314916
upgpkg: mldonkey 3.1.6-2 (miniupnpc rebuild)
Modified:
mldonkey/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-04-07 20:31:10 UTC (rev 314915)
+++ PKGBUILD2018-04-07 20:58:23 UTC (rev 314916)
@@ -3,12 +3,12 @@
pkgname=mldonkey
pkgver=3.1.6
-pkgrel=1
+pkgrel=2
pkgdesc='A multi-network P2P client'
arch=(x86_64)
url='http://mldonkey.sourceforge.net/'
license=(GPL)
-depends=(file gd miniupnpc libnatpmp)
+depends=(file gd miniupnpc libnatpmp libminiupnpc.so)
makedepends=(gtk2 librsvg) # we build our own version of ocaml and lablgtk2
optdepends=('librsvg: GUI support'
'gtk2: GUI support')
[arch-commits] Commit in mldonkey/trunk (PKGBUILD)
Date: Wednesday, January 25, 2017 @ 19:20:36
Author: anatolik
Revision: 209075
upgpkg: mldonkey 3.1.6-1
Modified:
mldonkey/trunk/PKGBUILD
--+
PKGBUILD | 24 ++--
1 file changed, 10 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-01-25 18:51:37 UTC (rev 209074)
+++ PKGBUILD2017-01-25 19:20:36 UTC (rev 209075)
@@ -2,8 +2,8 @@
# Maintainer: Anatol Pomozov
pkgname=mldonkey
-pkgver=3.1.5
-pkgrel=9
+pkgver=3.1.6
+pkgrel=1
pkgdesc='A multi-network P2P client'
arch=(i686 x86_64)
url='http://mldonkey.sourceforge.net/'
@@ -13,29 +13,25 @@
optdepends=('librsvg: GUI support'
'gtk2: GUI support')
backup=(etc/conf.d/mldonkey)
-source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2
+source=(https://github.com/ygrek/mldonkey/releases/download/release-${pkgver//./-}/mldonkey-$pkgver.tar.bz2{,.asc}
+http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2
mldonkey.conf
mldonkey.service
mldonkey.tmpfiles
mldonkey.sysusers
http://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
-
libminiupnpc19.patch::https://github.com/ygrek/mldonkey/commit/d0f0cd5ce38bac67ecc55e4cc5dd2e1883ebc2e4.patch)
-sha256sums=('74f9d4bcc72356aa28d0812767ef5b9daa03efc5d1ddabf56447dc04969911cb'
+https://forge.ocamlcore.org/frs/download.php/561/lablgtk-2.14.2.tar.gz)
+sha256sums=('1b36b57c05a83c2e363c085bf8e80630884c6c92ecdeffc1ad5e1c39a98e043d'
+'SKIP'
+'1b36b57c05a83c2e363c085bf8e80630884c6c92ecdeffc1ad5e1c39a98e043d'
'f1d9401cefd591662d49011c53fdb2788755a6f745a963e46d8037b990edeb6a'
'778cebe8edcffd63db3594054c2daa62ce571644a96ad235b8c95470b55c0415'
'9c78fbfbba4f8286e2c2299e4da6f76d0f34f33fde26964922707c34fb75157b'
'24d7ef8f6af93a8d87a82842b0ed796e35ce2f88d81734d9275eede8f4e10fba'
'd964b385e110c1517c9de1c6331476d5e7a3585cc692b6b6b8973f3a9be7da4b'
-'4981abedabdc462303f345104042c88af227ccd50fd30a9bf48fd353ab02d0ba'
-'f7193a666a27a2cab9c76d08018faa5a4537861fae02b290cacb42946bea0174')
+'4981abedabdc462303f345104042c88af227ccd50fd30a9bf48fd353ab02d0ba')
+validpgpkeys=(A34C49DD3DB8B78DFAEBE0FA6346B945708D5A0C)
-prepare() {
- cd mldonkey-$pkgver
- # https://github.com/ygrek/mldonkey/issues/13
- patch -p1 < ../libminiupnpc19.patch
-}
-
build() {
cd mldonkey-$pkgver
# mldonkey hardcodes its dependencies to some specific version
[arch-commits] Commit in mldonkey/trunk (PKGBUILD)
Date: Sunday, August 14, 2016 @ 04:29:50 Author: anatolik Revision: 186729 upgpkg: mldonkey 3.1.5-9 Modified: mldonkey/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-08-14 02:33:15 UTC (rev 186728) +++ PKGBUILD2016-08-14 04:29:50 UTC (rev 186729) @@ -3,7 +3,7 @@ pkgname=mldonkey pkgver=3.1.5 -pkgrel=8 +pkgrel=9 pkgdesc='A multi-network P2P client' arch=(i686 x86_64) url='http://mldonkey.sourceforge.net/'
[arch-commits] Commit in mldonkey/trunk (PKGBUILD)
Date: Thursday, June 30, 2016 @ 14:36:53 Author: anatolik Revision: 181645 miniupnpc 2.0 rebuild Modified: mldonkey/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-06-30 13:59:14 UTC (rev 181644) +++ PKGBUILD2016-06-30 14:36:53 UTC (rev 181645) @@ -3,7 +3,7 @@ pkgname=mldonkey pkgver=3.1.5 -pkgrel=7 +pkgrel=8 pkgdesc='A multi-network P2P client' arch=(i686 x86_64) url='http://mldonkey.sourceforge.net/'
[arch-commits] Commit in mldonkey/trunk (PKGBUILD fix_upnpDiscover.patch)
Date: Thursday, February 4, 2016 @ 19:27:35
Author: anatolik
Revision: 160335
FS#48030: use upstream patch for libminiupnpc 1.9
Modified:
mldonkey/trunk/PKGBUILD
Deleted:
mldonkey/trunk/fix_upnpDiscover.patch
+
PKGBUILD |9 +
fix_upnpDiscover.patch | 13 -
2 files changed, 5 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-02-04 18:26:58 UTC (rev 160334)
+++ PKGBUILD2016-02-04 18:27:35 UTC (rev 160335)
@@ -3,7 +3,7 @@
pkgname=mldonkey
pkgver=3.1.5
-pkgrel=6
+pkgrel=7
pkgdesc='A multi-network P2P client'
arch=(i686 x86_64)
url='http://mldonkey.sourceforge.net/'
@@ -20,7 +20,7 @@
mldonkey.tmpfiles
http://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
- fix_upnpDiscover.patch)
+
libminiupnpc19.patch::https://github.com/ygrek/mldonkey/commit/d0f0cd5ce38bac67ecc55e4cc5dd2e1883ebc2e4.patch)
sha256sums=('74f9d4bcc72356aa28d0812767ef5b9daa03efc5d1ddabf56447dc04969911cb'
'f1d9401cefd591662d49011c53fdb2788755a6f745a963e46d8037b990edeb6a'
'778cebe8edcffd63db3594054c2daa62ce571644a96ad235b8c95470b55c0415'
@@ -27,11 +27,12 @@
'45f45d2a3c064d5bbc0b6b9b70fa3497ed47cfecdd1ec52e175311f48eaa89dc'
'd964b385e110c1517c9de1c6331476d5e7a3585cc692b6b6b8973f3a9be7da4b'
'4981abedabdc462303f345104042c88af227ccd50fd30a9bf48fd353ab02d0ba'
-'d304bb2eca218dcfbcf7c420bc7375fa2316d5c360325a4e9b48d78d7cf1b7c7')
+'f7193a666a27a2cab9c76d08018faa5a4537861fae02b290cacb42946bea0174')
prepare() {
cd mldonkey-$pkgver
- patch -p1 < ../fix_upnpDiscover.patch
+ # https://github.com/ygrek/mldonkey/issues/13
+ patch -p1 < ../libminiupnpc19.patch
}
build() {
Deleted: fix_upnpDiscover.patch
===
--- fix_upnpDiscover.patch 2016-02-04 18:26:58 UTC (rev 160334)
+++ fix_upnpDiscover.patch 2016-02-04 18:27:35 UTC (rev 160335)
@@ -1,13 +0,0 @@
-diff --git a/src/utils/net/upnp_stubs.c b/src/utils/net/upnp_stubs.c
-index 41942f3..272b0cb 100644
a/src/utils/net/upnp_stubs.c
-+++ b/src/utils/net/upnp_stubs.c
-@@ -640,7 +640,7 @@ upnpPulse( ml_upnpmp_t * map )
- {
- struct UPNPDev * devlist;
- errno = 0;
--devlist = upnpDiscover( 2000, NULL, NULL, 0, 0, 0 );
-+devlist = upnpDiscover( 2000, NULL, NULL, 0, 0, 0, NULL );
- if( devlist == NULL )
- {
- dbg_printf( "upnpDiscover failed (errno %d - %s)\n", errno,
str_errno( errno ) );
[arch-commits] Commit in mldonkey/trunk (PKGBUILD)
Date: Sunday, December 6, 2015 @ 21:25:01 Author: foutrelis Revision: 149165 C++11 ABI rebuild Modified: mldonkey/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-12-06 20:24:02 UTC (rev 149164) +++ PKGBUILD2015-12-06 20:25:01 UTC (rev 149165) @@ -3,7 +3,7 @@ pkgname=mldonkey pkgver=3.1.5 -pkgrel=5 +pkgrel=6 pkgdesc='A multi-network P2P client' arch=(i686 x86_64) url='http://mldonkey.sourceforge.net/'
[arch-commits] Commit in mldonkey/trunk (PKGBUILD)
Date: Friday, October 9, 2015 @ 17:08:31 Author: anatolik Revision: 143505 upgpkg: mldonkey 3.1.5-5 miniupnpc 1.9.20151008 rebuild Modified: mldonkey/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-10-09 14:40:30 UTC (rev 143504) +++ PKGBUILD2015-10-09 15:08:31 UTC (rev 143505) @@ -3,7 +3,7 @@ pkgname=mldonkey pkgver=3.1.5 -pkgrel=4 +pkgrel=5 pkgdesc='A multi-network P2P client' arch=(i686 x86_64) url='http://mldonkey.sourceforge.net/'
[arch-commits] Commit in mldonkey/trunk (PKGBUILD fix_upnpDiscover.patch)
Date: Tuesday, September 8, 2015 @ 18:35:02
Author: anatolik
Revision: 139627
upgpkg: mldonkey 3.1.5-4
Rebuild for miniupnpc 1.9.20150730
Added:
mldonkey/trunk/fix_upnpDiscover.patch
Modified:
mldonkey/trunk/PKGBUILD
+
PKGBUILD | 13 ++---
fix_upnpDiscover.patch | 13 +
2 files changed, 23 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-09-08 16:14:28 UTC (rev 139626)
+++ PKGBUILD2015-09-08 16:35:02 UTC (rev 139627)
@@ -3,7 +3,7 @@
pkgname=mldonkey
pkgver=3.1.5
-pkgrel=3
+pkgrel=4
pkgdesc='A multi-network P2P client'
arch=(i686 x86_64)
url='http://mldonkey.sourceforge.net/'
@@ -19,14 +19,21 @@
mldonkey.service
mldonkey.tmpfiles
http://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
+ fix_upnpDiscover.patch)
sha256sums=('74f9d4bcc72356aa28d0812767ef5b9daa03efc5d1ddabf56447dc04969911cb'
'f1d9401cefd591662d49011c53fdb2788755a6f745a963e46d8037b990edeb6a'
'778cebe8edcffd63db3594054c2daa62ce571644a96ad235b8c95470b55c0415'
'45f45d2a3c064d5bbc0b6b9b70fa3497ed47cfecdd1ec52e175311f48eaa89dc'
'd964b385e110c1517c9de1c6331476d5e7a3585cc692b6b6b8973f3a9be7da4b'
-'4981abedabdc462303f345104042c88af227ccd50fd30a9bf48fd353ab02d0ba')
+'4981abedabdc462303f345104042c88af227ccd50fd30a9bf48fd353ab02d0ba'
+'d304bb2eca218dcfbcf7c420bc7375fa2316d5c360325a4e9b48d78d7cf1b7c7')
+prepare() {
+ cd mldonkey-$pkgver
+ patch -p1 < ../fix_upnpDiscover.patch
+}
+
build() {
cd mldonkey-$pkgver
# mldonkey hardcodes its dependencies to some specific version
Added: fix_upnpDiscover.patch
===
--- fix_upnpDiscover.patch (rev 0)
+++ fix_upnpDiscover.patch 2015-09-08 16:35:02 UTC (rev 139627)
@@ -0,0 +1,13 @@
+diff --git a/src/utils/net/upnp_stubs.c b/src/utils/net/upnp_stubs.c
+index 41942f3..272b0cb 100644
+--- a/src/utils/net/upnp_stubs.c
b/src/utils/net/upnp_stubs.c
+@@ -640,7 +640,7 @@ upnpPulse( ml_upnpmp_t * map )
+ {
+ struct UPNPDev * devlist;
+ errno = 0;
+-devlist = upnpDiscover( 2000, NULL, NULL, 0, 0, 0 );
++devlist = upnpDiscover( 2000, NULL, NULL, 0, 0, 0, NULL );
+ if( devlist == NULL )
+ {
+ dbg_printf( "upnpDiscover failed (errno %d - %s)\n", errno,
str_errno( errno ) );
[arch-commits] Commit in mldonkey/trunk (PKGBUILD mldonkey.install)
Date: Thursday, April 2, 2015 @ 19:22:32
Author: anatolik
Revision: 130546
upgpkg: mldonkey 3.1.5-3
Create tmp files on package install
Modified:
mldonkey/trunk/PKGBUILD
mldonkey/trunk/mldonkey.install
--+
PKGBUILD |9 -
mldonkey.install |4
2 files changed, 8 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-04-02 15:28:27 UTC (rev 130545)
+++ PKGBUILD2015-04-02 17:22:32 UTC (rev 130546)
@@ -3,13 +3,13 @@
pkgname=mldonkey
pkgver=3.1.5
-pkgrel=2
+pkgrel=3
pkgdesc='A multi-network P2P client'
arch=(i686 x86_64)
url='http://mldonkey.sourceforge.net/'
license=(GPL)
depends=(file gd miniupnpc libnatpmp)
-makedepends=(lablgtk2 librsvg ocaml)
+makedepends=(gtk2 librsvg) # we build our own version of ocaml and lablgtk2
optdepends=('librsvg: GUI support'
'gtk2: GUI support')
backup=(etc/conf.d/mldonkey)
@@ -29,9 +29,8 @@
build() {
cd mldonkey-$pkgver
- cp ../ocaml-3.12.0.tar.gz patches/
- cp ../lablgtk-2.14.2.tar.gz patches/
- # mldonkey requires the old version of ocaml
+ # 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/
./configure --prefix=/usr --enable-gui=newgui2 --enable-upnp-natpmp
--enable-batch
make
}
Modified: mldonkey.install
===
--- mldonkey.install2015-04-02 15:28:27 UTC (rev 130545)
+++ mldonkey.install2015-04-02 17:22:32 UTC (rev 130546)
@@ -12,6 +12,10 @@
if type -P update-desktop-database &> /dev/null; then
update-desktop-database -q
fi
+
+ if type -P systemd-tmpfiles &> /dev/null; then
+systemd-tmpfiles --create mldonkey.conf
+ fi
}
post_upgrade() {
[arch-commits] Commit in mldonkey/trunk (PKGBUILD)
Date: Tuesday, March 31, 2015 @ 00:01:53
Author: anatolik
Revision: 130388
upgpkg: mldonkey 3.1.5-2
Rebuild for miniupnpc https://www.archlinux.org/todo/miniupnpc-1920150206/
Build OCaml from sources - mldonkey requires specific old version of the
compiler
Modified:
mldonkey/trunk/PKGBUILD
--+
PKGBUILD | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-03-30 20:46:50 UTC (rev 130387)
+++ PKGBUILD2015-03-30 22:01:53 UTC (rev 130388)
@@ -3,7 +3,7 @@
pkgname=mldonkey
pkgver=3.1.5
-pkgrel=1
+pkgrel=2
pkgdesc='A multi-network P2P client'
arch=(i686 x86_64)
url='http://mldonkey.sourceforge.net/'
@@ -17,15 +17,22 @@
source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2
mldonkey.conf
mldonkey.service
-mldonkey.tmpfiles)
+mldonkey.tmpfiles
+http://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)
sha256sums=('74f9d4bcc72356aa28d0812767ef5b9daa03efc5d1ddabf56447dc04969911cb'
'f1d9401cefd591662d49011c53fdb2788755a6f745a963e46d8037b990edeb6a'
'778cebe8edcffd63db3594054c2daa62ce571644a96ad235b8c95470b55c0415'
-'45f45d2a3c064d5bbc0b6b9b70fa3497ed47cfecdd1ec52e175311f48eaa89dc')
+'45f45d2a3c064d5bbc0b6b9b70fa3497ed47cfecdd1ec52e175311f48eaa89dc'
+'d964b385e110c1517c9de1c6331476d5e7a3585cc692b6b6b8973f3a9be7da4b'
+'4981abedabdc462303f345104042c88af227ccd50fd30a9bf48fd353ab02d0ba')
build() {
cd mldonkey-$pkgver
- ./configure --prefix=/usr --enable-gui=newgui2 --enable-upnp-natpmp
+ cp ../ocaml-3.12.0.tar.gz patches/
+ cp ../lablgtk-2.14.2.tar.gz patches/
+ # mldonkey requires the old version of ocaml
+ ./configure --prefix=/usr --enable-gui=newgui2 --enable-upnp-natpmp
--enable-batch
make
}
[arch-commits] Commit in mldonkey/trunk (PKGBUILD fix_compile_error.patch)
Date: Sunday, March 23, 2014 @ 22:01:27
Author: anatolik
Revision: 108144
upgpkg: mldonkey 3.1.5-1
Modified:
mldonkey/trunk/PKGBUILD
Deleted:
mldonkey/trunk/fix_compile_error.patch
-+
PKGBUILD| 21 ---
fix_compile_error.patch | 254 --
2 files changed, 5 insertions(+), 270 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-03-23 19:45:43 UTC (rev 108143)
+++ PKGBUILD2014-03-23 21:01:27 UTC (rev 108144)
@@ -2,8 +2,8 @@
# Maintainer: Anatol Pomozov
pkgname=mldonkey
-pkgver=3.1.4
-pkgrel=2
+pkgver=3.1.5
+pkgrel=1
pkgdesc='A multi-network P2P client'
arch=(i686 x86_64)
url='http://mldonkey.sourceforge.net/'
@@ -17,23 +17,12 @@
source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2
mldonkey.conf
mldonkey.service
-mldonkey.tmpfiles
-fix_compile_error.patch)
-sha256sums=('1e454be51fec346d650a72049e4dc4471036d129a488443a67436af62ef375fe'
+mldonkey.tmpfiles)
+sha256sums=('74f9d4bcc72356aa28d0812767ef5b9daa03efc5d1ddabf56447dc04969911cb'
'f1d9401cefd591662d49011c53fdb2788755a6f745a963e46d8037b990edeb6a'
'778cebe8edcffd63db3594054c2daa62ce571644a96ad235b8c95470b55c0415'
-'45f45d2a3c064d5bbc0b6b9b70fa3497ed47cfecdd1ec52e175311f48eaa89dc'
-'172d1b129a068caafcb1e48c861b4b78b129b4ba50bb5e692b61cf00dcc66215')
+'45f45d2a3c064d5bbc0b6b9b70fa3497ed47cfecdd1ec52e175311f48eaa89dc')
-prepare() {
- cd mldonkey-$pkgver
-
- # http://mldonkey.sourceforge.net/phpBB2/viewtopic.php?p=32462#32462
- patch -p1 < "$srcdir/fix_compile_error.patch"
-
- rm config/configure # remove this file to force its regeneration, we've
just changed ./config/configure.in
-}
-
build() {
cd mldonkey-$pkgver
./configure --prefix=/usr --enable-gui=newgui2 --enable-upnp-natpmp
Deleted: fix_compile_error.patch
===
--- fix_compile_error.patch 2014-03-23 19:45:43 UTC (rev 108143)
+++ fix_compile_error.patch 2014-03-23 21:01:27 UTC (rev 108144)
@@ -1,254 +0,0 @@
-commit 64cf1e7eabf3087c111b54d7df490c5763d0546b
-Author: ygrek
-Date: Tue Mar 11 16:15:09 2014 +0800
-
-Revert "gettext: reduce complexity, drop unused code"
-
-This reverts commit 6a094b4381dacdc9043c8348002179eb87846e16.
-"Unused" code is actually used in gui
-
-Conflicts:
- src/utils/lib/gettext.ml4
-
-diff --git a/src/daemon/common/commonMessages.ml
b/src/daemon/common/commonMessages.ml
-index ebae333..0cffed2 100644
a/src/daemon/common/commonMessages.ml
-+++ b/src/daemon/common/commonMessages.ml
-@@ -1399,9 +1399,11 @@ let bad_login = _s "Bad login/password"
-
- let full_access = _s "Full access enabled"
-
--let download_started n = _s (Printf.sprintf "Download of file %d started"
n)
-+let download_started = message "download_started"
-+(T.boption (T.int T.bformat)) "Download of file %d started"
-
--let no_such_command s = _s (Printf.sprintf "No such command %s\n" s)
-+let no_such_command = message "no_such_command"
-+(T.boption (T.string T.bformat)) "No such command %s\n"
-
- let bad_number_of_args cmd help = _s (Printf.sprintf "Bad number of
arguments, see help for correct use:\n%s %s" cmd help)
-
-diff --git a/src/daemon/driver/driverCommands.ml
b/src/daemon/driver/driverCommands.ml
-index 6085073..c24be04 100644
a/src/daemon/driver/driverCommands.ml
-+++ b/src/daemon/driver/driverCommands.ml
-@@ -87,7 +87,7 @@ let execute_command arg_list output cmd args =
- let rec iter list =
- match list with
- [] ->
-- Buffer.add_string buf (no_such_command cmd)
-+ Gettext.buftext buf no_such_command cmd
- | (command, _, arg_kind, help) :: tail ->
- if command = cmd then begin
- if !verbose_user_commands && not (user2_is_admin
output.conn_user.ui_user) then
-diff --git a/src/daemon/driver/driverControlers.ml
b/src/daemon/driver/driverControlers.ml
-index e07ba77..69a1751 100644
a/src/daemon/driver/driverControlers.ml
-+++ b/src/daemon/driver/driverControlers.ml
-@@ -1296,7 +1296,7 @@ let http_handler o t r =
- List.iter CommonInteractive.start_download files;
-
- let module M = CommonMessages in
--Buffer.add_string buf (M.download_started num)
-+Gettext.buftext buf M.download_started num
- with e ->
- Printf.bprintf buf "Error %s with %s"
- (Printexc2.to_string e) value;
-diff --git a/src/utils/lib/gettext.ml4 b/src/utils/lib/gettext.ml4
-index 91a9fbb..fcfe50d 100644
a/src/utils/lib/gettext.ml4
-+++ b/src/utils/lib/gettext.ml4
-@@ -29,15 +29,15 @@ let lprintf_n fmt =
- lprintf2 log_prefix fmt
-
[arch-commits] Commit in mldonkey/trunk (PKGBUILD)
Date: Monday, March 17, 2014 @ 15:58:59
Author: anatolik
Revision: 107484
upgpkg: mldonkey 3.1.4-2
Enable upnp and natpmp features
Modified:
mldonkey/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-03-17 14:47:33 UTC (rev 107483)
+++ PKGBUILD2014-03-17 14:58:59 UTC (rev 107484)
@@ -3,12 +3,12 @@
pkgname=mldonkey
pkgver=3.1.4
-pkgrel=1
+pkgrel=2
pkgdesc='A multi-network P2P client'
arch=(i686 x86_64)
url='http://mldonkey.sourceforge.net/'
license=(GPL)
-depends=(file gd)
+depends=(file gd miniupnpc libnatpmp)
makedepends=(lablgtk2 librsvg ocaml)
optdepends=('librsvg: GUI support'
'gtk2: GUI support')
@@ -36,7 +36,7 @@
build() {
cd mldonkey-$pkgver
- ./configure --prefix=/usr --enable-gui=newgui2
+ ./configure --prefix=/usr --enable-gui=newgui2 --enable-upnp-natpmp
make
}
[arch-commits] Commit in mldonkey/trunk (PKGBUILD mldonkey.install)
Date: Tuesday, March 11, 2014 @ 05:56:41
Author: anatolik
Revision: 106965
desktop-file-utils is not a hard requirement. In should be used if it present
(head-full) machines; and update-desktop-database should be ignored on headless
machines
Modified:
mldonkey/trunk/PKGBUILD
mldonkey/trunk/mldonkey.install
--+
PKGBUILD |2 +-
mldonkey.install |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-03-10 23:09:14 UTC (rev 106964)
+++ PKGBUILD2014-03-11 04:56:41 UTC (rev 106965)
@@ -8,7 +8,7 @@
arch=(i686 x86_64)
url='http://mldonkey.sourceforge.net/'
license=(GPL)
-depends=(desktop-file-utils file gd)
+depends=(file gd)
makedepends=(lablgtk2 librsvg ocaml)
optdepends=('librsvg: GUI support'
'gtk2: GUI support')
Modified: mldonkey.install
===
--- mldonkey.install2014-03-10 23:09:14 UTC (rev 106964)
+++ mldonkey.install2014-03-11 04:56:41 UTC (rev 106965)
@@ -8,7 +8,7 @@
mkdir -p /var/lib/mldonkey
chown mldonkey:mldonkey /var/lib/mldonkey
- update-desktop-database -q
+ type -P update-desktop-database >/dev/null && update-desktop-database -q
}
post_upgrade() {
@@ -23,5 +23,5 @@
groupdel mldonkey
fi
- update-desktop-database -q
+ type -P update-desktop-database >/dev/null && update-desktop-database -q
}
[arch-commits] Commit in mldonkey/trunk (PKGBUILD)
Date: Friday, February 21, 2014 @ 23:31:55
Author: anatolik
Revision: 106069
mldonkey: use stronger hash function
Modified:
mldonkey/trunk/PKGBUILD
--+
PKGBUILD | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-02-21 22:30:45 UTC (rev 106068)
+++ PKGBUILD2014-02-21 22:31:55 UTC (rev 106069)
@@ -19,11 +19,11 @@
mldonkey.service
mldonkey.tmpfiles
gd_version.patch)
-sha1sums=('424386f277e84df55a2cbab213fae60787e42c8b'
- '7e70e5f3c7bf5036debde4dacbed463c0464a1e7'
- 'd6886479cf36fbee0a62def0291706973c91dfa5'
- 'a454b919fac518ecb32f6262afbef0dfc423401c'
- '18c4a0753d338bf24cac28dcbd43abcf59ce4534')
+sha256sums=('7c259f9f41cc12899045710ddce02e6d25962b2cb5c22f9cf58af0483f06d9e2'
+'f1d9401cefd591662d49011c53fdb2788755a6f745a963e46d8037b990edeb6a'
+'778cebe8edcffd63db3594054c2daa62ce571644a96ad235b8c95470b55c0415'
+'45f45d2a3c064d5bbc0b6b9b70fa3497ed47cfecdd1ec52e175311f48eaa89dc'
+'0b6f523848790627fb8020dae788e33132bbb7fdd76d6385b012b1b0ad7a2457')
prepare() {
cd mldonkey-$pkgver
