Skip to contentSkip to conversation

xfce4-session: 4.13.1 -> 4.13.2

PATCH New [email protected] 1 participant 3 messages May 25, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 xfce4-session: 4.13.1 -> 4.13.2

From: Kai Kang <[email protected]>

---
 .../{xfce4-session_4.13.1.bb => xfce4-session_4.13.2.bb}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-xfce/xfce4-session/{xfce4-session_4.13.1.bb => xfce4-session_4.13.2.bb} (85%)
meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.2.bb renamed from meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb +2 -2
similarity index 85%
rename from meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.1.bb
rename to meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.13.2.bb
index 3b9525fff..1a88e2de7 100644
@@ -12,8 +12,8 @@ REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI += " \
     file://0001-configure.in-hard-code-path-to-iceauth.patch \
 "
-SRC_URI[md5sum] = "a47988a2c871a411c19e3af1eefe591e"
-SRC_URI[sha256sum] = "c789f0f8234e06f5266f0c6ccdbdcc3c085e8d9eea06a0eafe8f7cfc4fe23af4"
+SRC_URI[md5sum] = "1306b6166f47cdf6e0c61259abbb621f"
+SRC_URI[sha256sum] = "c0be0c7e602c962d0e8fca63bd86165e60313d07bfb72cf2c3f99ab53e2a22a1"
 
 ALTERNATIVE_${PN} = "x-session-manager"
 ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/xfce4-session"
Signature · 1 line
2.20.0
#1 lore raw

PATCH 2/3 xfce4-screensaver: add recipe

From: Kai Kang <[email protected]>

xfce4-screensaver is a screen saver and locker which used by Xfce module 'actions' when click 'Lock Screen'.

* add a patch to fix configure QA issue for cross compile

---
 .../xfce4-screensaver/fix-cross-compile.patch | 60 +++++++++++++++++++
 .../xfce4-screensaver_0.1.4.bb                | 19 ++++++
 2 files changed, 79 insertions(+)
 create mode 100644 meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch
 create mode 100644 meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.4.bb
meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch new file +60 -0
new file mode 100644
index 000000000..f726064e2
@@ -0,0 +1,60 @@
+It adds '-I$includedir' to CPPFLAGS and adds '-L$libdir' to LDFLAGS in
+configure.ac which causes 'configure-unsafe' QA error. Don't add them for cross
+compile to avoid the QA issues.
+
+Upstream-Status: Inappropriate [cross compile specific]
+
+Signed-off-by: Kai Kang <[email protected]>
+
+diff --git a/configure.ac b/configure.ac
+index f0ec537..05c393d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -230,9 +230,9 @@ dnl ---------------------------------------------------------------------------
+ #
+ AC_DEFUN([AC_CHECK_X_HEADER], [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  if test \! -z "$includedir" ; then
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
++#  if test \! -z "$includedir" ; then
++#    CPPFLAGS="$CPPFLAGS -I$includedir"
++#  fi
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   AC_CHECK_HEADER([$1],[$2],[$3],[$4])
+   CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -241,9 +241,9 @@ AC_DEFUN([AC_CHECK_X_HEADER], [
+ #
+ AC_DEFUN([AC_TRY_X_COMPILE], [
+   ac_save_CPPFLAGS="$CPPFLAGS"
+-  if test \! -z "$includedir" ; then
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
++#  if test \! -z "$includedir" ; then
++#    CPPFLAGS="$CPPFLAGS -I$includedir"
++#  fi
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   AC_TRY_COMPILE([$1], [$2], [$3], [$4])
+   CPPFLAGS="$ac_save_CPPFLAGS"])
+@@ -257,15 +257,15 @@ AC_DEFUN([AC_CHECK_X_LIB], [
+   ac_save_LDFLAGS="$LDFLAGS"
+ #  ac_save_LIBS="$LIBS"
+ 
+-  if test \! -z "$includedir" ; then
+-    CPPFLAGS="$CPPFLAGS -I$includedir"
+-  fi
++#  if test \! -z "$includedir" ; then
++#    CPPFLAGS="$CPPFLAGS -I$includedir"
++#  fi
+   # note: $X_CFLAGS includes $x_includes
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ 
+-  if test \! -z "$libdir" ; then
+-    LDFLAGS="$LDFLAGS -L$libdir"
+-  fi
++#  if test \! -z "$libdir" ; then
++#    LDFLAGS="$LDFLAGS -L$libdir"
++#  fi
+   # note: $X_LIBS includes $x_libraries
+   LDFLAGS="$LDFLAGS $ALL_X_LIBS"
+ 
meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.4.bb new file +19 -0
new file mode 100644
index 000000000..fb2be6609
@@ -0,0 +1,19 @@
+SUMMARY = "Xfce screensaver Application"
+DESCRIPTION = "Xfce screensaver is a screen saver and locker that aims to have simple, sane, secure defaults and be well integrated with the desktop."
+HOMEPAGE = "https://git.xfce.org/apps/xfce4-screensaver/about/"
+SECTION = "x11/application"
+
+LICENSE = "GPLv2+ & LGPLv2+ "
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+                    file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
+                    "
+
+DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf"
+
+inherit xfce-app
+
+SRC_URI_append = " file://fix-cross-compile.patch"
+SRC_URI[md5sum] = "18a619849f85c24d784c7fa27279ca4b"
+SRC_URI[sha256sum] = "ed04ae32034b8e13a78495ca2bd7789a20ec7f67891ab9e92826a944371eabef"
+
+FILES_${PN} += "${datadir}/dbus-1 ${datadir}/desktop-directories"
Signature · 1 line
2.20.0
#2 lore raw

PATCH 3/3 packagegroup-xfce-extended: add xfce4-screensaver

In reply to [email protected]

From: Kai Kang <[email protected]>

Add xfce4-screensaver to RRECOMMENDS of packagegroup-xfce-extended.

---
 .../recipes-xfce/packagegroups/packagegroup-xfce-extended.bb     | 1 +
 1 file changed, 1 insertion(+)
meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +1 -0
index b412c2726..62b89fd47 100644
@@ -62,6 +62,7 @@ RRECOMMENDS_${PN} = " \
     thunar-archive-plugin \
     \
     xfce4-appfinder \
+    xfce4-screensaver \
     xfce4-screenshooter \
     xfce4-power-manager \
     ristretto \
Signature · 1 line
2.20.0