[PATCH 0/9] xfce4 and other updates

[PATCH 0/9] xfce4 and other updates

[Andreas Müller]

More gtk3 for xfce4

Andreas Müller (9):
  xfce4-power-manager: update to 1.6.0
  exo: update to 0.11.1
  xfce4-whiskermenu-plugin: update to 2.0.1
  xfce4-weather-plugin: update to 0.8.8
  xfce4-calculator-plugin: update to 0.6.0
  xfce4-notifyd: update to 0.3.2
  xfce4-clipman-plugin: update to 1.4.0
  poppler: update to 0.47.0
  physfs: move to sources found at github/supertux

 .../physfs/files/0001-fix-build-with-gcc-6.patch   | 52 ++++++++++++++++++++++
 .../physfs/{physfs_2.0.3.bb => physfs_git.bb}      | 10 +++--
 ...dd-manadatory-options-to-find-qt4-qt5-moc.patch | 14 +++---
 .../{poppler_0.43.0.bb => poppler_0.47.0.bb}       |  4 +-
 ...ce4-notifyd_0.2.4.bb => xfce4-notifyd_0.3.2.bb} |  5 ++-
 .../calculator/xfce4-calculator-plugin_0.5.1.bb    |  9 ----
 .../calculator/xfce4-calculator-plugin_0.6.0.bb    |  9 ++++
 ...ugin_1.2.6.bb => xfce4-clipman-plugin_1.4.0.bb} |  5 +--
 ...ugin_0.8.7.bb => xfce4-weather-plugin_0.8.8.bb} |  4 +-
 ..._1.5.3.bb => xfce4-whiskermenu-plugin_2.0.1.bb} |  4 +-
 .../exo/exo/reduce-build-to-exo-csource-only.patch | 28 ++++++++----
 .../exo/{exo_0.10.6.bb => exo_0.11.1.bb}           |  4 +-
 ...nager_1.4.4.bb => xfce4-power-manager_1.6.0.bb} |  8 ++--
 13 files changed, 112 insertions(+), 44 deletions(-)
 create mode 100644 meta-filesystems/recipes-support/physfs/files/0001-fix-build-with-gcc-6.patch
 rename meta-filesystems/recipes-support/physfs/{physfs_2.0.3.bb => physfs_git.bb} (55%)
 rename meta-oe/recipes-support/poppler/{poppler_0.43.0.bb => poppler_0.47.0.bb} (93%)
 rename meta-xfce/recipes-apps/xfce4-notifyd/{xfce4-notifyd_0.2.4.bb => xfce4-notifyd_0.3.2.bb} (73%)
 delete mode 100644 meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.5.1.bb
 create mode 100644 meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.6.0.bb
 rename meta-xfce/recipes-panel-plugins/clipman/{xfce4-clipman-plugin_1.2.6.bb => xfce4-clipman-plugin_1.4.0.bb} (68%)
 rename meta-xfce/recipes-panel-plugins/weather/{xfce4-weather-plugin_0.8.7.bb => xfce4-weather-plugin_0.8.8.bb} (72%)
 rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_1.5.3.bb => xfce4-whiskermenu-plugin_2.0.1.bb} (63%)
 rename meta-xfce/recipes-xfce/exo/{exo_0.10.6.bb => exo_0.11.1.bb} (87%)
 rename meta-xfce/recipes-xfce/xfce4-power-manager/{xfce4-power-manager_1.4.4.bb => xfce4-power-manager_1.6.0.bb} (78%)

-- 
2.5.5

[PATCH 1/9] xfce4-power-manager: update to 1.6.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...{xfce4-power-manager_1.4.4.bb => xfce4-power-manager_1.6.0.bb} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta-xfce/recipes-xfce/xfce4-power-manager/{xfce4-power-manager_1.4.4.bb => xfce4-power-manager_1.6.0.bb} (78%)

diff --git a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.4.bb b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.0.bb
similarity index 78%
rename from meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.4.bb
rename to meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.0.bb
index 2070db2..71df34c 100644
--- a/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.4.4.bb
+++ b/meta-xfce/recipes-xfce/xfce4-power-manager/xfce4-power-manager_1.6.0.bb
@@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 inherit xfce
 
-DEPENDS += "gtk+ glib-2.0 dbus-glib xfconf libxfce4ui libxfce4util libnotify \
-           libxrandr virtual/libx11 libxext xfce4-panel upower"
+DEPENDS += "gtk+3 glib-2.0 dbus-glib xfconf libxfce4ui libxfce4util libnotify \
+           libxrandr virtual/libx11 libxext xfce4-panel upower libxscrnsaver"
 
-SRC_URI[md5sum] = "e7d00548e58bf19229e727818184c1e0"
-SRC_URI[sha256sum] = "c50ec8aa7e7848c57c0f856dceb8132eb5f37585f0ac1627459ab8c882c73b07"
+SRC_URI[md5sum] = "2e2e24a1a22912d6a561ba6155887503"
+SRC_URI[sha256sum] = "bde3157e06ab31ff23648d163d53ee5095f7819544a9f48d3a96d57829857f2b"
 
 EXTRA_OECONF = " \
     --enable-network-manager \
-- 
2.5.5

[PATCH 2/9] exo: update to 0.11.1

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../exo/exo/reduce-build-to-exo-csource-only.patch | 28 +++++++++++++++-------
 .../exo/{exo_0.10.6.bb => exo_0.11.1.bb}           |  4 ++--
 2 files changed, 22 insertions(+), 10 deletions(-)
 rename meta-xfce/recipes-xfce/exo/{exo_0.10.6.bb => exo_0.11.1.bb} (87%)

diff --git a/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch b/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch
index 246511c..8073fca 100644
--- a/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch
+++ b/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch
@@ -15,11 +15,11 @@ Upstream-Status: Inappropriate [configuration]
 Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
 ---
  Makefile.am  | 10 +---------
- configure.ac | 20 --------------------
- 2 files changed, 1 insertion(+), 29 deletions(-)
+ configure.ac | 26 --------------------------
+ 2 files changed, 1 insertion(+), 35 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index ad7c6ce..3acd94a 100644
+index 9979b36..05d594e 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,15 +1,7 @@
@@ -40,7 +40,7 @@ index ad7c6ce..3acd94a 100644
  distclean-local:
  	rm -rf *.cache *~
 diff --git a/configure.ac b/configure.ac
-index bb9be05..23471d0 100644
+index b66c92b..5243132 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -116,15 +116,6 @@ AC_PROG_CC()
@@ -59,7 +59,7 @@ index bb9be05..23471d0 100644
  
  dnl ***************************************
  dnl *** Check for standard header files ***
-@@ -171,17 +162,6 @@ dnl ***********************************
+@@ -171,29 +162,12 @@ dnl ***********************************
  dnl *** Check for required packages ***
  dnl ***********************************
  XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0])
@@ -69,14 +69,26 @@ index bb9be05..23471d0 100644
 -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
 -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
 -XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.30.0], [gio-unix], [GIO-Unix features])
--
+ 
+ dnl ***********************************************************
+ dnl *** Optional support for a GTK+3 version of the library ***
+ dnl ***********************************************************
+-XDT_CHECK_OPTIONAL_PACKAGE([GTK3],
+-                           [gtk+-3.0], [3.6.0], [gtk3],
+-                           [GTK+ 3 support])
+-XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4UI2],
+-                           [libxfce4ui-2], [4.12.0], [libxfce4ui2],
+-                           [GTK+ 3 support: libxfce4ui-2])
+ AM_CONDITIONAL([ENABLE_GTK3_LIBRARY], [test "x$GTK3_FOUND" = "xyes" && test "x$LIBXFCE4UI2_FOUND" = "xyes" ])
+ 
 -dnl *********************
 -dnl *** Check for X11 ***
 -dnl *********************
 -XDT_CHECK_LIBX11_REQUIRE()
- 
+-
  dnl *************************
  dnl *** Check for gtk-doc ***
+ dnl *************************
 -- 
-1.9.3
+2.5.5
 
diff --git a/meta-xfce/recipes-xfce/exo/exo_0.10.6.bb b/meta-xfce/recipes-xfce/exo/exo_0.11.1.bb
similarity index 87%
rename from meta-xfce/recipes-xfce/exo/exo_0.10.6.bb
rename to meta-xfce/recipes-xfce/exo/exo_0.11.1.bb
index f1b5ae5..92155f2 100644
--- a/meta-xfce/recipes-xfce/exo/exo_0.10.6.bb
+++ b/meta-xfce/recipes-xfce/exo/exo_0.11.1.bb
@@ -17,8 +17,8 @@ SRC_URI_append_class-native = " \
     file://reduce-build-to-exo-csource-only.patch \
 "
 
-SRC_URI[md5sum] = "895e4f38d2cfe58d69679e2902a335a5"
-SRC_URI[sha256sum] = "1cc0e5a432e050a5e5aa64d126b988f4440da4f27474aaf42a4d8e13651d0752"
+SRC_URI[md5sum] = "866292556586facb034191aa66431697"
+SRC_URI[sha256sum] = "c70c47f690284a5cb4f507dd89088efbdd8123506f924e33a5f97aab74eb97d4"
 
 PACKAGES =+ "exo-csource"
 
-- 
2.5.5

[PATCH 3/9] xfce4-whiskermenu-plugin: update to 2.0.1

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...-whiskermenu-plugin_1.5.3.bb => xfce4-whiskermenu-plugin_2.0.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-panel-plugins/whiskermenu/{xfce4-whiskermenu-plugin_1.5.3.bb => xfce4-whiskermenu-plugin_2.0.1.bb} (63%)

diff --git a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_1.5.3.bb b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.0.1.bb
similarity index 63%
rename from meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_1.5.3.bb
rename to meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.0.1.bb
index 60bf114..7cf1e43 100644
--- a/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_1.5.3.bb
+++ b/meta-xfce/recipes-panel-plugins/whiskermenu/xfce4-whiskermenu-plugin_2.0.1.bb
@@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 inherit xfce-panel-plugin cmake
 
-SRC_URI[md5sum] = "ef51234117dabdf02f2f415643d858d6"
-SRC_URI[sha256sum] = "68a8273395671d5163fd8cd9a73755ef03d4ea74891204498a21582a9c2e925b"
+SRC_URI[md5sum] = "0718eb713809df0049fcc5b7ddd9b533"
+SRC_URI[sha256sum] = "ced25394512d102090a504b95f19dffad8bf38754c3ddad85c765b184a7eb616"
-- 
2.5.5

[PATCH 4/9] xfce4-weather-plugin: update to 0.8.8

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../{xfce4-weather-plugin_0.8.7.bb => xfce4-weather-plugin_0.8.8.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-panel-plugins/weather/{xfce4-weather-plugin_0.8.7.bb => xfce4-weather-plugin_0.8.8.bb} (72%)

diff --git a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.7.bb b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.8.bb
similarity index 72%
rename from meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.7.bb
rename to meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.8.bb
index 3519f4a..28d3bda 100644
--- a/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.7.bb
+++ b/meta-xfce/recipes-panel-plugins/weather/xfce4-weather-plugin_0.8.8.bb
@@ -7,7 +7,7 @@ inherit xfce-panel-plugin
 
 DEPENDS += "libsoup-2.4 dbus-glib upower"
 
-SRC_URI[md5sum] = "ecab0eaad870e460da4597e76f43e6e6"
-SRC_URI[sha256sum] = "071e71106868c7d90c936256d837ca834d0ca6f54daea59a9b5fc11b318e65b0"
+SRC_URI[md5sum] = "29fe8892bb4c6b1e639862a63110618e"
+SRC_URI[sha256sum] = "651b722714fdafde3f548f183958c34e1539cf563193d7e51f28bfb6933d6d3f"
 
 FILES_${PN} += "${datadir}/xfce4/weather"
-- 
2.5.5

[PATCH 5/9] xfce4-calculator-plugin: update to 0.6.0

[Andreas Müller]

* License checksum change was caused by FSF address change
* add gtk-icon-cache to inherit

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../calculator/xfce4-calculator-plugin_0.5.1.bb                  | 9 ---------
 .../calculator/xfce4-calculator-plugin_0.6.0.bb                  | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.5.1.bb
 create mode 100644 meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.6.0.bb

diff --git a/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.5.1.bb b/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.5.1.bb
deleted file mode 100644
index cb1fa5e..0000000
--- a/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.5.1.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-SUMMARY = "A calculator plugin for the Xfce panel"
-HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-calculator-plugin"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-inherit xfce-panel-plugin
-
-SRC_URI[md5sum] = "8d7bf07a669a2884a409a7b03f89be5c"
-SRC_URI[sha256sum] = "7dcb04a3da7b85cb1f35f546c366fe8529f1c15f1c8c290edb91d16c07f5fd6d"
diff --git a/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.6.0.bb b/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.6.0.bb
new file mode 100644
index 0000000..de0d0a0
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/calculator/xfce4-calculator-plugin_0.6.0.bb
@@ -0,0 +1,9 @@
+SUMMARY = "A calculator plugin for the Xfce panel"
+HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-calculator-plugin"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=909430f63fddd63f120ba29e8979f65c"
+
+inherit xfce-panel-plugin gtk-icon-cache
+
+SRC_URI[md5sum] = "1b956a89693d039a61b4725cefb23a4d"
+SRC_URI[sha256sum] = "eb51765580ea4650f9cf062382a820fb6483ee5dbe003aeb6f063929e299f9c2"
-- 
2.5.5

[PATCH 6/9] xfce4-notifyd: update to 0.3.2

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../xfce4-notifyd/{xfce4-notifyd_0.2.4.bb => xfce4-notifyd_0.3.2.bb} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-apps/xfce4-notifyd/{xfce4-notifyd_0.2.4.bb => xfce4-notifyd_0.3.2.bb} (73%)

diff --git a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.2.4.bb b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.3.2.bb
similarity index 73%
rename from meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.2.4.bb
rename to meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.3.2.bb
index 6d170b6..2894af4 100644
--- a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.2.4.bb
+++ b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.3.2.bb
@@ -6,14 +6,15 @@ DEPENDS = "libxfce4util libxfce4ui xfconf gtk+ dbus dbus-glib libnotify"
 
 inherit xfce-app
 
-SRC_URI[md5sum] = "094be6f29206aac8299f27084e284e88"
-SRC_URI[sha256sum] = "8c7ed62f9496816d1391281f77d1b32216f9bf6fd22fbe4f6f3f4e07a6bbced0"
+SRC_URI[md5sum] = "9ee9bd823710c8753cb99f5a8028d528"
+SRC_URI[sha256sum] = "c554db55d9d759c32115e9e5da029bd68b07628438ef2bac7ae4b458567c85a4"
 
 do_compile_prepend() {
     mkdir -p xfce4-notifyd
 }
 
 FILES_${PN} += " \
+    ${systemd_user_unitdir} \
     ${libdir}/xfce4/notifyd \
     ${datadir}/themes \
     ${datadir}/dbus-1 \
-- 
2.5.5

[PATCH 7/9] xfce4-clipman-plugin: update to 1.4.0

[Andreas Müller]

optional usage of libunique was removed in [1]

[1] https://git.xfce.org/panel-plugins/xfce4-clipman-plugin/commit/configure.ac.in?id=75071c2c4c6090dc8b7a06ceca958dcca4d2283b

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../{xfce4-clipman-plugin_1.2.6.bb => xfce4-clipman-plugin_1.4.0.bb} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta-xfce/recipes-panel-plugins/clipman/{xfce4-clipman-plugin_1.2.6.bb => xfce4-clipman-plugin_1.4.0.bb} (68%)

diff --git a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.6.bb b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.0.bb
similarity index 68%
rename from meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.6.bb
rename to meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.0.bb
index a07f3cc..988fbb0 100644
--- a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.2.6.bb
+++ b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.0.bb
@@ -8,11 +8,10 @@ inherit xfce-panel-plugin
 
 DEPENDS += "xfconf xproto libxtst"
 
-SRC_URI[md5sum] = "f7f2440647493243cbd7787eaee92fcb"
-SRC_URI[sha256sum] = "23043f99c3e5257d1f3d68b5ee5125e3469c15620d098e22c6250386197f48a5"
+SRC_URI[md5sum] = "cd9c05e54e0fcc3f8d774cacdf18f42c"
+SRC_URI[sha256sum] = "a97671540663df1d90503f73695ac36e16fa2c832be8845ad9402529b8148294"
 
 PACKAGECONFIG ??= ""
-PACKAGECONFIG[unique] = "--enable-unique,--disable-unique,libunique"
 PACKAGECONFIG[qrencode] = "--enable-libqrencode,--disable-libqrencode,qrencode"
 
 FILES_${PN} += "${datadir}/appdata"
-- 
2.5.5

[PATCH 8/9] poppler: update to 0.47.0

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../0001-add-manadatory-options-to-find-qt4-qt5-moc.patch  | 14 +++++++-------
 .../poppler/{poppler_0.43.0.bb => poppler_0.47.0.bb}       |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename meta-oe/recipes-support/poppler/{poppler_0.43.0.bb => poppler_0.47.0.bb} (93%)

diff --git a/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch b/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch
index 560b073..4e80d24 100644
--- a/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch
+++ b/meta-oe/recipes-support/poppler/poppler/0001-add-manadatory-options-to-find-qt4-qt5-moc.patch
@@ -14,10 +14,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
  1 file changed, 8 insertions(+), 47 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 67599c0..40fa596 100644
+index c4cfc2c..8e961c7 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -622,25 +622,10 @@ AC_SUBST(POPPLER_QT4_LIBS)
+@@ -712,25 +712,10 @@ AC_SUBST(POPPLER_QT4_LIBS)
  AC_SUBST(POPPLER_QT4_TEST_LIBS)
  
  if test x$enable_poppler_qt4 = xyes; then
@@ -47,27 +47,27 @@ index 67599c0..40fa596 100644
    AC_SUBST(MOCQT4)
    AC_MSG_RESULT([$MOCQT4])
  fi
-@@ -679,34 +664,10 @@ AC_SUBST(POPPLER_QT5_LIBS)
+@@ -769,34 +754,10 @@ AC_SUBST(POPPLER_QT5_LIBS)
  AC_SUBST(POPPLER_QT5_TEST_LIBS)
  
  if test x$enable_poppler_qt5 = xyes; then
 -  AC_CHECK_TOOL(MOCQT5, moc)
 -  AC_MSG_CHECKING([for Qt5 moc])
 -  mocversion=`$MOCQT5 -v 2>&1`
--  mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+-  mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
 -  if test x"$mocversiongrep" != x"$mocversion"; then
 -    AC_MSG_RESULT([no])
 -    # moc was not the qt5 one, try with moc-qt5
 -    AC_CHECK_TOOL(MOCQT52, moc-qt5)
 -    AC_MSG_CHECKING([for Qt5 moc-qt5])
 -    mocversion=`$MOCQT52 -v 2>&1`
--    mocversiongrep=`echo $mocversion | grep "Qt 5\|moc-qt5 5\|moc 5"`
+-    mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc-qt5 5|moc 5"`
 -    if test x"$mocversiongrep" != x"$mocversion"; then
 -      AC_CHECK_TOOL(QTCHOOSER, qtchooser)
 -      AC_MSG_CHECKING([for qtchooser])
 -      qt5tooldir=`QT_SELECT=qt5 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
 -      mocversion=`$qt5tooldir/moc -v 2>&1`
--      mocversiongrep=`echo $mocversion | grep "Qt 5\|moc 5"`
+-      mocversiongrep=`echo $mocversion | grep -E "Qt 5|moc 5"`
 -      if test x"$mocversiongrep" != x"$mocversion"; then
 -        # no valid moc found
 -        enable_poppler_qt5=no;
@@ -87,5 +87,5 @@ index 67599c0..40fa596 100644
    AC_MSG_RESULT([$MOCQT5])
  fi
 -- 
-1.9.3
+2.5.5
 
diff --git a/meta-oe/recipes-support/poppler/poppler_0.43.0.bb b/meta-oe/recipes-support/poppler/poppler_0.47.0.bb
similarity index 93%
rename from meta-oe/recipes-support/poppler/poppler_0.43.0.bb
rename to meta-oe/recipes-support/poppler/poppler_0.47.0.bb
index 9abcd2c..071cfb2 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.43.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.47.0.bb
@@ -7,8 +7,8 @@ SRC_URI = " \
     file://0001-add-manadatory-options-to-find-qt4-qt5-moc.patch \
     file://0002-fix-gcc-6-math-ambiguous-errors.patch \
 "
-SRC_URI[md5sum] = "1d2b001663119855cdfbc0713dbfb9c6"
-SRC_URI[sha256sum] = "c720e26a26ee10b7ebc9e256d2ee7adcdb536cf85f9f1c4777a38f7f81fb2456"
+SRC_URI[md5sum] = "669b195ff24173d35cacf1d20b6fe4fa"
+SRC_URI[sha256sum] = "b872e7228fc34a71ce4b47a5aea2a57ae67528818fa846e1e0eda089319bd242"
 
 DEPENDS = "fontconfig zlib cairo lcms"
 
-- 
2.5.5

[PATCH 9/9] physfs: move to sources found at github/supertux

[Andreas Müller]

It seems that physfs is still maintained there and has the functionality
required by latest supertux.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../physfs/files/0001-fix-build-with-gcc-6.patch   | 52 ++++++++++++++++++++++
 .../physfs/{physfs_2.0.3.bb => physfs_git.bb}      | 10 +++--
 2 files changed, 59 insertions(+), 3 deletions(-)
 create mode 100644 meta-filesystems/recipes-support/physfs/files/0001-fix-build-with-gcc-6.patch
 rename meta-filesystems/recipes-support/physfs/{physfs_2.0.3.bb => physfs_git.bb} (55%)

diff --git a/meta-filesystems/recipes-support/physfs/files/0001-fix-build-with-gcc-6.patch b/meta-filesystems/recipes-support/physfs/files/0001-fix-build-with-gcc-6.patch
new file mode 100644
index 0000000..805c4a1
--- /dev/null
+++ b/meta-filesystems/recipes-support/physfs/files/0001-fix-build-with-gcc-6.patch
@@ -0,0 +1,52 @@
+From 06fe4c205094e0b65d3e5d1244f52089ed5bdafb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 25 Sep 2016 23:50:22 +0200
+Subject: [PATCH] fix build with gcc-6
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/archiver_zip.c | 1 -
+ src/physfs_miniz.h | 3 +++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/archiver_zip.c b/src/archiver_zip.c
+index 5c4996d..3b436db 100644
+--- a/src/archiver_zip.c
++++ b/src/archiver_zip.c
+@@ -845,7 +845,6 @@ static ZIPentry *zip_hash_ancestors(ZIPinfo *info, char *name)
+     if (sep)
+     {
+         const size_t namelen = (sep - name) + 1;
+-        ZIPentry *parent;
+ 
+         *sep = '\0';  /* chop off last piece. */
+         retval = zip_find_entry(info, name);
+diff --git a/src/physfs_miniz.h b/src/physfs_miniz.h
+index 619cb71..fd877c0 100644
+--- a/src/physfs_miniz.h
++++ b/src/physfs_miniz.h
+@@ -194,6 +194,8 @@ struct tinfl_decompressor_tag
+     code_len = TINFL_FAST_LOOKUP_BITS; do { temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)]; } while (temp < 0); \
+   } sym = temp; bit_buf >>= code_len; num_bits -= code_len; } MZ_MACRO_END
+ 
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wmisleading-indentation"
+ static tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags)
+ {
+   static const int s_length_base[31] = { 3,4,5,6,7,8,9,10,11,13, 15,17,19,23,27,31,35,43,51,59, 67,83,99,115,131,163,195,227,258,0,0 };
+@@ -465,6 +467,7 @@ common_exit:
+   }
+   return status;
+ }
++#pragma GCC diagnostic pop
+ 
+ /* Flush values. For typical usage you only need MZ_NO_FLUSH and MZ_FINISH. The other stuff is for advanced use. */
+ enum { MZ_NO_FLUSH = 0, MZ_PARTIAL_FLUSH = 1, MZ_SYNC_FLUSH = 2, MZ_FULL_FLUSH = 3, MZ_FINISH = 4, MZ_BLOCK = 5 };
+-- 
+2.5.5
+
diff --git a/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb b/meta-filesystems/recipes-support/physfs/physfs_git.bb
similarity index 55%
rename from meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb
rename to meta-filesystems/recipes-support/physfs/physfs_git.bb
index 5618f28..3f1c156 100644
--- a/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb
+++ b/meta-filesystems/recipes-support/physfs/physfs_git.bb
@@ -6,6 +6,10 @@ DEPENDS = "readline zlib"
 
 inherit cmake
 
-SRC_URI = "http://icculus.org/${BPN}/downloads/${BP}.tar.bz2"
-SRC_URI[md5sum] = "c2c727a8a8deb623b521b52d0080f613"
-SRC_URI[sha256sum] = "ca862097c0fb451f2cacd286194d071289342c107b6fe69079c079883ff66b69"
+SRC_URI = " \
+    git://github.com/SuperTux/physfs.git \
+    file://0001-fix-build-with-gcc-6.patch \
+"
+SRCREV = "f3b45a94d0b7c0a85469b1e60fefd8383b6719ba"
+S = "${WORKDIR}/git"
+PV = "2.0.3+git${SRCPV}"
-- 
2.5.5

Re: [PATCH 9/9] physfs: move to sources found at github/supertux

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 5246 bytes --]

On Tue, Sep 27, 2016 at 07:55:33AM +0200, Andreas Müller wrote:
> It seems that physfs is still maintained there and has the functionality
> required by latest supertux.
> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  .../physfs/files/0001-fix-build-with-gcc-6.patch   | 52 ++++++++++++++++++++++
>  .../physfs/{physfs_2.0.3.bb => physfs_git.bb}      | 10 +++--
>  2 files changed, 59 insertions(+), 3 deletions(-)
>  create mode 100644 meta-filesystems/recipes-support/physfs/files/0001-fix-build-with-gcc-6.patch
>  rename meta-filesystems/recipes-support/physfs/{physfs_2.0.3.bb => physfs_git.bb} (55%)
> 
> diff --git a/meta-filesystems/recipes-support/physfs/files/0001-fix-build-with-gcc-6.patch b/meta-filesystems/recipes-support/physfs/files/0001-fix-build-with-gcc-6.patch
> new file mode 100644
> index 0000000..805c4a1
> --- /dev/null
> +++ b/meta-filesystems/recipes-support/physfs/files/0001-fix-build-with-gcc-6.patch
> @@ -0,0 +1,52 @@
> +From 06fe4c205094e0b65d3e5d1244f52089ed5bdafb Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> +Date: Sun, 25 Sep 2016 23:50:22 +0200
> +Subject: [PATCH] fix build with gcc-6
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> +---
> + src/archiver_zip.c | 1 -
> + src/physfs_miniz.h | 3 +++
> + 2 files changed, 3 insertions(+), 1 deletion(-)
> +
> +diff --git a/src/archiver_zip.c b/src/archiver_zip.c
> +index 5c4996d..3b436db 100644
> +--- a/src/archiver_zip.c
> ++++ b/src/archiver_zip.c
> +@@ -845,7 +845,6 @@ static ZIPentry *zip_hash_ancestors(ZIPinfo *info, char *name)
> +     if (sep)
> +     {
> +         const size_t namelen = (sep - name) + 1;
> +-        ZIPentry *parent;
> + 
> +         *sep = '\0';  /* chop off last piece. */
> +         retval = zip_find_entry(info, name);
> +diff --git a/src/physfs_miniz.h b/src/physfs_miniz.h
> +index 619cb71..fd877c0 100644
> +--- a/src/physfs_miniz.h
> ++++ b/src/physfs_miniz.h
> +@@ -194,6 +194,8 @@ struct tinfl_decompressor_tag
> +     code_len = TINFL_FAST_LOOKUP_BITS; do { temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)]; } while (temp < 0); \
> +   } sym = temp; bit_buf >>= code_len; num_bits -= code_len; } MZ_MACRO_END
> + 
> ++#pragma GCC diagnostic push
> ++#pragma GCC diagnostic ignored "-Wmisleading-indentation"
> + static tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags)
> + {
> +   static const int s_length_base[31] = { 3,4,5,6,7,8,9,10,11,13, 15,17,19,23,27,31,35,43,51,59, 67,83,99,115,131,163,195,227,258,0,0 };
> +@@ -465,6 +467,7 @@ common_exit:
> +   }
> +   return status;
> + }
> ++#pragma GCC diagnostic pop
> + 
> + /* Flush values. For typical usage you only need MZ_NO_FLUSH and MZ_FINISH. The other stuff is for advanced use. */
> + enum { MZ_NO_FLUSH = 0, MZ_PARTIAL_FLUSH = 1, MZ_SYNC_FLUSH = 2, MZ_FULL_FLUSH = 3, MZ_FINISH = 4, MZ_BLOCK = 5 };
> +-- 
> +2.5.5
> +
> diff --git a/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb b/meta-filesystems/recipes-support/physfs/physfs_git.bb
> similarity index 55%
> rename from meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb
> rename to meta-filesystems/recipes-support/physfs/physfs_git.bb
> index 5618f28..3f1c156 100644
> --- a/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb
> +++ b/meta-filesystems/recipes-support/physfs/physfs_git.bb
> @@ -6,6 +6,10 @@ DEPENDS = "readline zlib"
>  
>  inherit cmake
>  
> -SRC_URI = "http://icculus.org/${BPN}/downloads/${BP}.tar.bz2"
> -SRC_URI[md5sum] = "c2c727a8a8deb623b521b52d0080f613"
> -SRC_URI[sha256sum] = "ca862097c0fb451f2cacd286194d071289342c107b6fe69079c079883ff66b69"
> +SRC_URI = " \
> +    git://github.com/SuperTux/physfs.git \
> +    file://0001-fix-build-with-gcc-6.patch \
> +"
> +SRCREV = "f3b45a94d0b7c0a85469b1e60fefd8383b6719ba"

ERROR: physfs-2.0.3+gitAUTOINC+f3b45a94d0-r0 do_populate_lic: QA Issue: physfs: The LIC_FILES_CHKSUM does not match for file://LICENSE.txt;md5=5d94e3eaaa10b00ca803ba35a3e87cde
physfs: The new md5 checksum is 4424d2cfb8a288df2843c4467b5d719a
physfs: Check if the license information has changed in /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/physfs/2.0.3+gitAUTOINC+f3b45a94d0-r0/git/LICENSE.txt to verify that the LICENSE value "Zlib" remains valid [license-checksum]
ERROR: physfs-2.0.3+gitAUTOINC+f3b45a94d0-r0 do_populate_lic: Fatal QA errors found, failing task.
ERROR: physfs-2.0.3+gitAUTOINC+f3b45a94d0-r0 do_populate_lic: Function failed: populate_lic_qa_checksum

> +S = "${WORKDIR}/git"
> +PV = "2.0.3+git${SRCPV}"
> -- 
> 2.5.5
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 169 bytes --]

Re: [PATCH 9/9] physfs: move to sources found at github/supertux

[Andreas Müller]

On Wed, Sep 28, 2016 at 2:35 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Tue, Sep 27, 2016 at 07:55:33AM +0200, Andreas Müller wrote:
>> It seems that physfs is still maintained there and has the functionality
>> required by latest supertux.
>>
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> ---
>>  .../physfs/files/0001-fix-build-with-gcc-6.patch   | 52 ++++++++++++++++++++++
>>  .../physfs/{physfs_2.0.3.bb => physfs_git.bb}      | 10 +++--
>>  2 files changed, 59 insertions(+), 3 deletions(-)
>>  create mode 100644 meta-filesystems/recipes-support/physfs/files/0001-fix-build-with-gcc-6.patch
>>  rename meta-filesystems/recipes-support/physfs/{physfs_2.0.3.bb => physfs_git.bb} (55%)
>>
>> diff --git a/meta-filesystems/recipes-support/physfs/files/0001-fix-build-with-gcc-6.patch b/meta-filesystems/recipes-support/physfs/files/0001-fix-build-with-gcc-6.patch
>> new file mode 100644
>> index 0000000..805c4a1
>> --- /dev/null
>> +++ b/meta-filesystems/recipes-support/physfs/files/0001-fix-build-with-gcc-6.patch
>> @@ -0,0 +1,52 @@
>> +From 06fe4c205094e0b65d3e5d1244f52089ed5bdafb Mon Sep 17 00:00:00 2001
>> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
>> +Date: Sun, 25 Sep 2016 23:50:22 +0200
>> +Subject: [PATCH] fix build with gcc-6
>> +MIME-Version: 1.0
>> +Content-Type: text/plain; charset=UTF-8
>> +Content-Transfer-Encoding: 8bit
>> +
>> +Upstream-Status: Pending
>> +
>> +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>> +---
>> + src/archiver_zip.c | 1 -
>> + src/physfs_miniz.h | 3 +++
>> + 2 files changed, 3 insertions(+), 1 deletion(-)
>> +
>> +diff --git a/src/archiver_zip.c b/src/archiver_zip.c
>> +index 5c4996d..3b436db 100644
>> +--- a/src/archiver_zip.c
>> ++++ b/src/archiver_zip.c
>> +@@ -845,7 +845,6 @@ static ZIPentry *zip_hash_ancestors(ZIPinfo *info, char *name)
>> +     if (sep)
>> +     {
>> +         const size_t namelen = (sep - name) + 1;
>> +-        ZIPentry *parent;
>> +
>> +         *sep = '\0';  /* chop off last piece. */
>> +         retval = zip_find_entry(info, name);
>> +diff --git a/src/physfs_miniz.h b/src/physfs_miniz.h
>> +index 619cb71..fd877c0 100644
>> +--- a/src/physfs_miniz.h
>> ++++ b/src/physfs_miniz.h
>> +@@ -194,6 +194,8 @@ struct tinfl_decompressor_tag
>> +     code_len = TINFL_FAST_LOOKUP_BITS; do { temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)]; } while (temp < 0); \
>> +   } sym = temp; bit_buf >>= code_len; num_bits -= code_len; } MZ_MACRO_END
>> +
>> ++#pragma GCC diagnostic push
>> ++#pragma GCC diagnostic ignored "-Wmisleading-indentation"
>> + static tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags)
>> + {
>> +   static const int s_length_base[31] = { 3,4,5,6,7,8,9,10,11,13, 15,17,19,23,27,31,35,43,51,59, 67,83,99,115,131,163,195,227,258,0,0 };
>> +@@ -465,6 +467,7 @@ common_exit:
>> +   }
>> +   return status;
>> + }
>> ++#pragma GCC diagnostic pop
>> +
>> + /* Flush values. For typical usage you only need MZ_NO_FLUSH and MZ_FINISH. The other stuff is for advanced use. */
>> + enum { MZ_NO_FLUSH = 0, MZ_PARTIAL_FLUSH = 1, MZ_SYNC_FLUSH = 2, MZ_FULL_FLUSH = 3, MZ_FINISH = 4, MZ_BLOCK = 5 };
>> +--
>> +2.5.5
>> +
>> diff --git a/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb b/meta-filesystems/recipes-support/physfs/physfs_git.bb
>> similarity index 55%
>> rename from meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb
>> rename to meta-filesystems/recipes-support/physfs/physfs_git.bb
>> index 5618f28..3f1c156 100644
>> --- a/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb
>> +++ b/meta-filesystems/recipes-support/physfs/physfs_git.bb
>> @@ -6,6 +6,10 @@ DEPENDS = "readline zlib"
>>
>>  inherit cmake
>>
>> -SRC_URI = "http://icculus.org/${BPN}/downloads/${BP}.tar.bz2"
>> -SRC_URI[md5sum] = "c2c727a8a8deb623b521b52d0080f613"
>> -SRC_URI[sha256sum] = "ca862097c0fb451f2cacd286194d071289342c107b6fe69079c079883ff66b69"
>> +SRC_URI = " \
>> +    git://github.com/SuperTux/physfs.git \
>> +    file://0001-fix-build-with-gcc-6.patch \
>> +"
>> +SRCREV = "f3b45a94d0b7c0a85469b1e60fefd8383b6719ba"
>
> ERROR: physfs-2.0.3+gitAUTOINC+f3b45a94d0-r0 do_populate_lic: QA Issue: physfs: The LIC_FILES_CHKSUM does not match for file://LICENSE.txt;md5=5d94e3eaaa10b00ca803ba35a3e87cde
> physfs: The new md5 checksum is 4424d2cfb8a288df2843c4467b5d719a
> physfs: Check if the license information has changed in /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/physfs/2.0.3+gitAUTOINC+f3b45a94d0-r0/git/LICENSE.txt to verify that the LICENSE value "Zlib" remains valid [license-checksum]
> ERROR: physfs-2.0.3+gitAUTOINC+f3b45a94d0-r0 do_populate_lic: Fatal QA errors found, failing task.
> ERROR: physfs-2.0.3+gitAUTOINC+f3b45a94d0-r0 do_populate_lic: Function failed: populate_lic_qa_checksum
>
>> +S = "${WORKDIR}/git"
>> +PV = "2.0.3+git${SRCPV}"
>> --
>> 2.5.5
>>
Strange thought I tested that - will check and send V2.

Andreas