gentoo resync : 15.01.2020

3 files changed, 108 insertions, 5 deletions

diff --git a/media-sound/gogglesmm/Manifest b/media-sound/gogglesmm/Manifest
index a524526445f7..9c236d14c767 100644
--- a/media-sound/gogglesmm/Manifest
+++ b/media-sound/gogglesmm/Manifest
@@ -1,3 +1,4 @@
+AUX gogglesmm-1.2.1-use-fox-1.7.67.patch 5107 BLAKE2B 3f2099cb4839b4b8c7807c34f1d80508426890fd80fa88160fdea7842846dd18af21aeeffe50bc4d1adb8f223ec14b8790150c319855e5173691a05e6343da7a SHA512 270cd9c28ca026196025b57791ff3d77bb93ff0650e643cdca8f2b19e81a3dcb05248b5ca1dbf33a641663caccb1c0ee3633b8cc8cb6d7ec7a55e2a2da8d6c34
 DIST gogglesmm-1.2.1.tar.gz 3015072 BLAKE2B 6a33ba6b678bc23e449898e4f492064301ca9c37239d713fa5ccb857d51bb4c4cf5dc1d4576f2f6dc745eaff607f4400e5600f45c4cbdde8c43cee5ca1fc34f4 SHA512 c165ddde463afcf863b74f00dfa1566077007f51617fa00a95dfcdeeab49da9ee87406f6bdc7779c597002d1e587886c7992e9e892ce4988f3bb14f015336547
-EBUILD gogglesmm-1.2.1.ebuild 1054 BLAKE2B 849e203f8510809c8e9d4fdd053b0052c62d20f842738cd94b1e52d3df1cbe60c0952ba5793154fe1d46b0d5354ebbb097c41f616e62d8c12996de2951a50f38 SHA512 7636616b6395079653257fd90c9ffada53f40ac6e584d948e69cd9b5e3e38e5c13c425cc6dedb59692cf56c4537c8975d9a3ffd4fc3d0588bca797f44f007f1d
+EBUILD gogglesmm-1.2.1-r1.ebuild 1099 BLAKE2B 581bd73cf3fcb83e0f21e19b40f93e9c414db9743f9b917acef7bd52909b046a74b657fa6108f4b00111c1f83f0b9f8fbc7be5e079e465abbb277f5b8f6f6da0 SHA512 affa38da15bd48dc39f7b83a0fca55e57386a8074c1f0de81581f74c8a917650222657f404abc4e9a49c2b83faa6d40ef77744f8a0d57a66b76659fe573b2dd7
 MISC metadata.xml 448 BLAKE2B 4a31050a18310ba35f5357159e9ada1671feda06dc71635617acf8825073a3a822aa95a3d3110545ff9ccdd809d317ab45000f5aaab5d8f52a8dad0c6133a03a SHA512 349f8b931b5a24ea7b588f63f67b38ac00e752491031cf434802719bd4d4d62aa5c7d277cf5e6a3dee72c570c121606b6a108e080262b1070de538c384552858
diff --git a/media-sound/gogglesmm/files/gogglesmm-1.2.1-use-fox-1.7.67.patch b/media-sound/gogglesmm/files/gogglesmm-1.2.1-use-fox-1.7.67.patch
new file mode 100644
index 000000000000..44ec564e6f2d
--- /dev/null
+++ b/media-sound/gogglesmm/files/gogglesmm-1.2.1-use-fox-1.7.67.patch
@@ -0,0 +1,100 @@
+diff -ru gogglesmm-1.2.1/gap/ap_http_response.cpp /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/gap/ap_http_response.cpp
+--- gogglesmm-1.2.1/gap/ap_http_response.cpp	2018-08-01 01:59:22.000000000 +0200
++++ /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/gap/ap_http_response.cpp	2019-12-16 19:21:06.596524627 +0100
+@@ -341,7 +341,7 @@
+         break;
+ 
+       parameters.insert(str.mid(ks,kp-ks),
+-                        unescape(str.mid(s,p-s),'\"','\"'));
++                        FX::FXString::unescape(str.mid(s,p-s),'\"','\"'));
+       p++;
+       }
+     else {
+diff -ru gogglesmm-1.2.1/src/GMDBus.cpp /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMDBus.cpp
+--- gogglesmm-1.2.1/src/GMDBus.cpp	2018-08-01 01:59:22.000000000 +0200
++++ /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMDBus.cpp	2019-12-16 19:27:05.072866638 +0100
+@@ -60,7 +60,7 @@
+   void setuphooks() {
+     for (FXint i=0;i<connections.no();i++) {
+       if (!connections.empty(i)) {
+-        static_cast<GMDBus*>(connections.value(i))->setup_event_loop();
++        static_cast<GMDBus*>(connections.data(i))->setup_event_loop();
+         }
+       }
+     }
+@@ -532,7 +532,7 @@
+   /// remove any pending proxy replies;
+   for (FXint i=0;i<serial.no();i++) {
+     if (!serial.empty(i)) {
+-      GMDBusProxyReply * reply = static_cast<GMDBusProxyReply*>(serial.value(i));
++      GMDBusProxyReply * reply = static_cast<GMDBusProxyReply*>(serial.data(i));
+       delete reply;
+       }
+     }
+diff -ru gogglesmm-1.2.1/src/GMFilename.cpp /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMFilename.cpp
+--- gogglesmm-1.2.1/src/GMFilename.cpp	2018-08-01 01:59:22.000000000 +0200
++++ /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMFilename.cpp	2019-12-16 19:24:44.801263832 +0100
+@@ -167,7 +167,7 @@
+     else if (Unicode::isPrint(src.wc(i))) {
+       if (codec->wc2mb(&c,1,src.wc(i))==1) {
+         if (c==undefined_character) {
+-          FXString dcm = decompose(src.mid(i,src.extent(i)),false);
++          FXString dcm = FX::FXString::decompose(src.mid(i,src.extent(i)),false);
+           for (FXint j=0;j<dcm.length();j+=dcm.inc(j)) {
+             if (Unicode::isPrint(dcm.wc(j)) && codec->wc2mb(&c,1,dcm.wc(j)) && c!=0x1a) {
+               n++;
+@@ -190,7 +190,7 @@
+         if (c==undefined_character) {
+           /* If codec didn't contain a mapping to the required character,
+              do a compatibility decomposition and try mapping those */
+-          FXString dcm = decompose(src.mid(i,src.extent(i)),false);
++          FXString dcm = FX::FXString::decompose(src.mid(i,src.extent(i)),false);
+           for (FXint j=0;j<dcm.length();j+=dcm.inc(j)) {
+             if (Unicode::isPrint(dcm.wc(j)) && codec->wc2mb(&c,1,dcm.wc(j)) && c!=undefined_character) {
+               dst[n++]=c;
+@@ -208,7 +208,7 @@
+ 
+ 
+ FXString TextConverter::convert_to_ascii(const FXString & input) const {
+-  FXString src = decompose(input,false);
++  FXString src = FX::FXString::decompose(input,false);
+   FXString dst;
+   FXint i,n=0;
+ 
+diff -ru gogglesmm-1.2.1/src/GMTrackDatabase.cpp /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMTrackDatabase.cpp
+--- gogglesmm-1.2.1/src/GMTrackDatabase.cpp	2018-08-01 01:59:22.000000000 +0200
++++ /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/GMTrackDatabase.cpp	2019-12-16 19:26:29.609893508 +0100
+@@ -1372,8 +1372,8 @@
+ void GMTrackDatabase::clear_path_lookup() {
+   DEBUG_DB_GET();
+   for (FXint i=0;i<pathdict.no();i++) {
+-    if (!pathdict.empty(i) && pathdict.value(i)!=nullptr) {
+-      free(pathdict.value(i));
++    if (!pathdict.empty(i) && pathdict.data(i)!=nullptr) {
++      free(pathdict.data(i));
+       }
+     }
+   pathdict.clear();
+@@ -1424,8 +1424,8 @@
+ void GMTrackDatabase::clear_artist_lookup() {
+   DEBUG_DB_GET();
+   for (FXint i=0;i<artistdict.no();i++) {
+-    if (!artistdict.empty(i) && artistdict.value(i)!=nullptr) {
+-      FXString * a = (FXString*)artistdict.value(i);
++    if (!artistdict.empty(i) && artistdict.data(i)!=nullptr) {
++      FXString * a = (FXString*)artistdict.data(i);
+       delete a;
+       }
+     }
+diff -ru gogglesmm-1.2.1/src/gmutils.h /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/gmutils.h
+--- gogglesmm-1.2.1/src/gmutils.h	2018-08-01 01:59:22.000000000 +0200
++++ /var/tmp/portage/media-sound/gogglesmm-1.2.1/work/gogglesmm-1.2.1/src/gmutils.h	2019-12-16 19:22:25.340787153 +0100
+@@ -26,7 +26,7 @@
+   FXint remove(FXint name) {  return (FXint)(FXival)FXHash::remove((void*)(FXival)name); }
+   //FXint find(FXint name) const { return (FXint)(FXival)FXHash::find((void*)(FXival)name); }
+   FXint at(FXint name) const { return (FXint)(FXival)FXHash::at((void*)(FXival)name); }
+-  FXint key(FXuint pos) const { return (FXint)(FXival)table[pos].name; }
++  FXint key(FXuint pos) const { return (FXint)(FXival)table[pos].key; }
+   FXint value(FXuint pos) const { return (FXint)(FXival)table[pos].data; }
+   void adopt(FXIntMap &);
+   void load(FXStream & store);
diff --git a/media-sound/gogglesmm/gogglesmm-1.2.1.ebuild b/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
index 683ddf4f799e..de8b8d6c52df 100644
--- a/media-sound/gogglesmm/gogglesmm-1.2.1.ebuild
+++ b/media-sound/gogglesmm/gogglesmm-1.2.1-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Fast and light music player"
 HOMEPAGE="https://gogglesmm.github.io"
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+dbus +flac +mad +vorbis +ogg +opus +aac +pulseaudio +opengl nls"
 
-RDEPEND="x11-libs/fox:=
+RDEPEND="x11-libs/fox:1.7
 		x11-libs/libSM
 		x11-libs/libICE
 		dev-db/sqlite
@@ -32,6 +32,8 @@ RDEPEND="x11-libs/fox:=
 		opengl? ( media-libs/libepoxy virtual/glu )"
 DEPEND="dev-util/cmake ${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/"${P}"-use-fox-1.7.67.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_DBUS="$(usex dbus)"
@@ -39,5 +41,5 @@ src_configure() {
 		-DWITH_NLS="$(usex nls)"
 		-DWITH_CFOX=OFF
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }