20170807.1 global branch merge.current-20170807.1

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

3 files changed, 76 insertions, 7 deletions

diff --git a/network/aMule/0001-desktop-files-GenericName.patch b/network/aMule/0001-desktop-files-GenericName.patch
new file mode 100644
index 0000000000..e33b437bbc
--- /dev/null
+++ b/network/aMule/0001-desktop-files-GenericName.patch
@@ -0,0 +1,65 @@
+diff -Naur a/amule.desktop b/amule.desktop
+--- a/amule.desktop	2015-12-05 12:17:44.000000000 +0800
++++ b/amule.desktop	2016-01-28 17:59:27.159722045 +0800
+@@ -5,6 +5,6 @@
+ Terminal=false
+ Type=Application
+ Categories=Network;P2P;
+-Comment=A client for the eD2k network
+-Comment[fr]=Un client pour le réseau eD2k
+-Comment[tr]=eD2k ağı için istemci
++GenericName=A client for the eD2k network
++GenericName[fr]=Un client pour le réseau eD2k
++GenericName[tr]=eD2k ağı için istemci
+diff -Naur a/amulegui.desktop b/amulegui.desktop
+--- a/amulegui.desktop	2015-12-05 12:17:44.000000000 +0800
++++ b/amulegui.desktop	2016-01-28 18:00:09.484782640 +0800
+@@ -5,8 +5,8 @@
+ Terminal=false
+ Type=Application
+ Categories=Network;P2P;
+-Comment=aMule remote control
+-Comment[de]=aMule-Fernsteuerung
+-Comment[fr]=Contrôle à distance d'aMule
+-Comment[hu]=aMule távoli vezérlő
+-Comment[tr]=aMule uzaktan kumandası
++GenericName=aMule remote control
++GenericName[de]=aMule-Fernsteuerung
++GenericName[fr]=Contrôle à distance d'aMule
++GenericName[hu]=aMule távoli vezérlő
++GenericName[tr]=aMule uzaktan kumandası
+diff -Naur a/src/utils/aLinkCreator/alc.desktop b/src/utils/aLinkCreator/alc.desktop
+--- a/src/utils/aLinkCreator/alc.desktop	2015-12-05 12:17:44.000000000 +0800
++++ b/src/utils/aLinkCreator/alc.desktop	2016-01-28 17:56:59.532032109 +0800
+@@ -5,8 +5,8 @@
+ Terminal=false
+ Type=Application
+ Categories=Network;P2P;
+-Comment=aMule ed2k link creator
+-Comment[de]=ed2k-Linkersteller
+-Comment[fr]=Créateur de liens ed2k d'aMule
+-Comment[hu]=ed2k hivatkozás készítő
+-Comment[tr]=aMule için ed2k bağlantı yaratıcısı
++GenericName=aMule ed2k link creator
++GenericName[de]=ed2k-Linkersteller
++GenericName[fr]=Créateur de liens ed2k d'aMule
++GenericName[hu]=ed2k hivatkozás készítő
++GenericName[tr]=aMule için ed2k bağlantı yaratıcısı
+diff -Naur a/src/utils/wxCas/wxcas.desktop b/src/utils/wxCas/wxcas.desktop
+--- a/src/utils/wxCas/wxcas.desktop	2015-12-05 12:17:44.000000000 +0800
++++ b/src/utils/wxCas/wxcas.desktop	2016-01-28 17:58:46.434702658 +0800
+@@ -5,8 +5,8 @@
+ Terminal=false
+ Type=Application
+ Categories=Network;P2P;
+-Comment=aMule online statistics
+-Comment[de]=aMule-Onlinestatistik
+-Comment[fr]=Statistiques d'aMule en ligne
+-Comment[hu]=aMule online statisztikák
+-Comment[tr]=Çevrim içi aMule istatistikleri
++GenericName=aMule online statistics
++GenericName[de]=aMule-Onlinestatistik
++GenericName[fr]=Statistiques d'aMule en ligne
++GenericName[hu]=aMule online statisztikák
++GenericName[tr]=Çevrim içi aMule istatistikleri
+
diff --git a/network/aMule/aMule.SlackBuild b/network/aMule/aMule.SlackBuild
index 296b1e5b39..d10bf430ff 100644
--- a/network/aMule/aMule.SlackBuild
+++ b/network/aMule/aMule.SlackBuild
@@ -5,7 +5,7 @@
 # Maintained by Ozan Türkyılmaz ozan.turkyilmaz@gmial.com
 
 PRGNAM=aMule
-VERSION=${VERSION:-2.3.1}
+VERSION=${VERSION:-2.3.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -31,6 +31,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "arm" ]; then
+  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
+  LIBDIRSUFFIX=""
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
@@ -122,8 +125,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Fix for gcc-4.7.x
-sed -i "s|NotifyObservers|this->NotifyObservers|" src/ObservableQueue.h
+patch -p1 < $CWD/0001-desktop-files-GenericName.patch
+
+sh autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
diff --git a/network/aMule/aMule.info b/network/aMule/aMule.info
index ad125272ab..e75dcfd142 100644
--- a/network/aMule/aMule.info
+++ b/network/aMule/aMule.info
@@ -1,10 +1,10 @@
 PRGNAM="aMule"
-VERSION="2.3.1"
+VERSION="2.3.2"
 HOMEPAGE="http://www.amule.org"
-DOWNLOAD="http://downloads.sourceforge.net/amule/aMule-2.3.1.tar.xz"
-MD5SUM="5f5707ad2073d37100409870aa5d3f93"
+DOWNLOAD="http://downloads.sourceforge.net/amule/aMule-2.3.2.tar.xz"
+MD5SUM="4e666c33f2c87874d389d6d45eb82b7a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="cryptopp wxPython"
+REQUIRES="cryptopp wxGTK3"
 MAINTAINER="Ozan Türkyılmaz"
 EMAIL="ozan.turkyilmaz@gmail.com"