summaryrefslogtreecommitdiff
path: root/app-crypt/eid-mw
diff options
context:
space:
mode:
authorLiguros - Gitlab CI/CD [master] <gitlab@liguros.net>2021-01-17 23:35:33 +0000
committerLiguros - Gitlab CI/CD [master] <gitlab@liguros.net>2021-01-17 23:35:33 +0000
commit8e8120eabdd28020aa69c7a60505cce2edd20adc (patch)
tree061bf0acdc672720e0bc3a2d575f67d25aedb2d8 /app-crypt/eid-mw
parentc16790af2c9b4cbc38e565d4311252193ff85484 (diff)
downloadbaldeagleos-repo-21.1.2.tar.gz
baldeagleos-repo-21.1.2.tar.xz
baldeagleos-repo-21.1.2.zip
Updating liguros repo21.1.2
Diffstat (limited to 'app-crypt/eid-mw')
-rw-r--r--app-crypt/eid-mw/Manifest2
-rw-r--r--app-crypt/eid-mw/eid-mw-5.0.11.ebuild (renamed from app-crypt/eid-mw/eid-mw-5.0.8.ebuild)5
-rw-r--r--app-crypt/eid-mw/eid-mw-9999.ebuild5
-rw-r--r--app-crypt/eid-mw/files/use-printf-in-Makefile.patch21
4 files changed, 30 insertions, 3 deletions
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 466fd8512839..0d7a5adcda5f 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,2 +1,2 @@
DIST eid-mw-4.4.27.tar.gz 7481892 BLAKE2B 5d1268946a62436eec74a7ed83e8391c1ceb0274ef8798b95bee2087e4e439d46ea5f88b8237cff1e925d31d1762fe979a959ce35efd4d6210dda580827bab3b SHA512 c4e9917907bb351b9dd427eb48c2124e55de0d8a73cfd142b9cb5e81c84f91e62a39a90bb1fbd109fb59aeb089898ffcd18ef5ccf2ab72c883b41ec4d9b9edf1
-DIST eid-mw-5.0.8.tar.gz 8782476 BLAKE2B ece43bff5de108f4d92534aeda3d88c1109fbf54f99c4de0442c02958a9b0edef3e34d94015b9f3a865317d88c2bd21d1adbbf15010cd1fbd99787985190dee5 SHA512 dc9eaaec419082bc6e1f6cd11063c79c5aac0e7910027d9cbb34dbe8ede9d600c93b7b38a7e4491c5eb9a0068e537d78854b3fc3b2581d464dd4939185469e46
+DIST eid-mw-5.0.11.tar.gz 8928406 BLAKE2B 36358b758e1e865a7a99099f548b8e7acc045df73ab6290dc5ebf7e82c8b03566137340498e815cdb3458c63961233ef0e8530f75dfeed18e714b6fb4fcfbbcd SHA512 2753739797dbfe5b01c4538fca02f5a0833a3850a2b62cd4e7179a148b0459c9217311f44d1f03b9b9655187af7d90cbe53dd1e4a8318a0cba864d346f8c9324
diff --git a/app-crypt/eid-mw/eid-mw-5.0.8.ebuild b/app-crypt/eid-mw/eid-mw-5.0.11.ebuild
index 064bbcfb9d4a..b0e0654fd5b0 100644
--- a/app-crypt/eid-mw/eid-mw-5.0.8.ebuild
+++ b/app-crypt/eid-mw/eid-mw-5.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -59,6 +59,9 @@ src_prepare() {
-e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
configure.ac || die
+ # See bug #751472
+ eapply "${FILESDIR}/use-printf-in-Makefile.patch"
+
eautoreconf
}
diff --git a/app-crypt/eid-mw/eid-mw-9999.ebuild b/app-crypt/eid-mw/eid-mw-9999.ebuild
index 19055f55bc53..5b1071332616 100644
--- a/app-crypt/eid-mw/eid-mw-9999.ebuild
+++ b/app-crypt/eid-mw/eid-mw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -53,6 +53,9 @@ src_prepare() {
-e '/LDFLAGS="/ s:$CPPFLAGS:$LDFLAGS:' \
configure.ac || die
+ # See bug #751472
+ eapply "${FILESDIR}/use-printf-in-Makefile.patch"
+
eautoreconf
}
diff --git a/app-crypt/eid-mw/files/use-printf-in-Makefile.patch b/app-crypt/eid-mw/files/use-printf-in-Makefile.patch
new file mode 100644
index 000000000000..5b4ef2adc07e
--- /dev/null
+++ b/app-crypt/eid-mw/files/use-printf-in-Makefile.patch
@@ -0,0 +1,21 @@
+diff -ur a/plugins_tools/eid-viewer/Makefile.am b/plugins_tools/eid-viewer/Makefile.am
+--- a/plugins_tools/eid-viewer/Makefile.am 2020-08-19 15:32:50.000000000 +0200
++++ b/plugins_tools/eid-viewer/Makefile.am 2020-12-21 23:07:49.980421703 +0200
+@@ -125,13 +125,13 @@
+ SUBDIRS = . gtk/po test uml
+
+ resources/%.c: resources/%.png
+- echo -e "#include <gdk-pixbuf/gdk-pixdata.h>\n#if __GNUC__ >= 4\n#pragma GCC diagnostic push\n#pragma GCC diagnostic ignored \"-Wpointer-sign\"\n#endif\n" > $@
++ printf '%s\n' '#include <gdk-pixbuf/gdk-pixdata.h>' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@
+ gdk-pixbuf-csource --struct --extern --name `basename $^ .png` $^ >> $@
+- echo -e "#pragma GCC diagnostic pop\n" >> $@
++ printf '%s\n' '#pragma GCC diagnostic pop' >> $@
+ resources/%.c: resources/%.jpg
+- echo -e "#include <gdk-pixbuf/gdk-pixdata.h>\n#if __GNUC__ >= 4\n#pragma GCC diagnostic push\n#pragma GCC diagnostic ignored \"-Wpointer-sign\"\n#endif\n" > $@
++ printf '%s\n' '#include <gdk-pixbuf/gdk-pixdata.h>' '#if __GNUC__ >= 4' '#pragma GCC diagnostic push' '#pragma GCC diagnostic ignored "-Wpointer-sign"' '#endif' > $@
+ gdk-pixbuf-csource --struct --extern --name `basename $^ .jpg` $^ >> $@
+- echo -e "#pragma GCC diagnostic pop\n" >> $@
++ printf '%s\n' '#pragma GCC diagnostic pop' >> $@
+
+ BUILT_SOURCES = gtk/viewer_glade.h \
+ resources/coat_of_arms_nl.c \