diff options
Diffstat (limited to 'meta-xfce/recipes-apps')
28 files changed, 292 insertions, 283 deletions
diff --git a/meta-xfce/recipes-apps/catfish/catfish_1.4.10.bb b/meta-xfce/recipes-apps/catfish/catfish_1.4.10.bb deleted file mode 100644 index 602368b3a0..0000000000 --- a/meta-xfce/recipes-apps/catfish/catfish_1.4.10.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Catfish is a handy file searching tool for linux and unix" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" - -inherit xfce-app distutils3 gtk-icon-cache - -DEPENDS += "python3-distutils-extra-native" - -B = "${S}" - -SRC_URI[md5sum] = "1b8e7bfd955364b7912fb0a248329b3a" -SRC_URI[sha256sum] = "2573a004105031f871c92fed22a0c4b15bb96f2dff6e36c4f2959f56b62e343d" - -FILES_${PN} += "${datadir}/metainfo" - -RDEPENDS_${PN} += "python3-pygobject" diff --git a/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb b/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb new file mode 100644 index 0000000000..249c8e1bd8 --- /dev/null +++ b/meta-xfce/recipes-apps/catfish/catfish_4.16.3.bb @@ -0,0 +1,25 @@ +SUMMARY = "Catfish is a handy file searching tool for linux and unix" +SECTION = "x11/application" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" + +inherit xfce-app python_setuptools_build_meta gtk-icon-cache mime-xdg features_check + +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" + +DEPENDS += "python3-distutils-extra-native" + +SRC_URI[sha256sum] = "e9a99a62d10981391508dd43f3cbfa2d50a69bd6b7d1eeef7d30ba4c673dcfda" + +FILES:${PN} += "${datadir}/metainfo" + +RDEPENDS:${PN} += "python3-pygobject python3-dbus" + +do_install:append() { + # + # Until catfish upstream figures out a way to overcome this buildpath issue, we need to do such adjustments here. + # + sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' ${D}${datadir}/applications/org.xfce.Catfish.desktop + sed -i -e 's#${RECIPE_SYSROOT_NATIVE}##g' ${D}${PYTHON_SITEPACKAGES_DIR}/catfish_lib/catfishconfig.py + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/catfish_lib/__pycache__/catfishconfig.*.pyc +} diff --git a/meta-xfce/recipes-apps/gigolo/gigolo_0.5.0.bb b/meta-xfce/recipes-apps/gigolo/gigolo_0.5.2.bb index 4446214f85..6b845ea613 100644 --- a/meta-xfce/recipes-apps/gigolo/gigolo_0.5.0.bb +++ b/meta-xfce/recipes-apps/gigolo/gigolo_0.5.2.bb @@ -1,11 +1,10 @@ SUMMARY = "Gigolo is a frontend to easily manage connections to remote filesystems using GIO/GVfs" SECTION = "x11/application" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" DEPENDS = "gtk+3 intltool-native xfce4-dev-tools-native" inherit xfce-app -SRC_URI[md5sum] = "273111f5d7c26898e5ddea7b97d5dfe1" -SRC_URI[sha256sum] = "97a301aff012a143d0b99e7ecbb27084d3872aa203a74745e8357aab3a1880dc" +SRC_URI[sha256sum] = "e34a1aa0755f9f6c234c7d24b23a6cecd6ef50741d79da3bb6f698a2281dbbc3" diff --git a/meta-xfce/recipes-apps/menulibre/menulibre_2.2.1.bb b/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb index 8196e6c170..609caf3461 100644 --- a/meta-xfce/recipes-apps/menulibre/menulibre_2.2.1.bb +++ b/meta-xfce/recipes-apps/menulibre/menulibre_2.2.3.bb @@ -1,7 +1,7 @@ DESCRIPTION = "An advanced menu editor" -HOMEPAGE = "https://launchpad.net/menulibre" +HOMEPAGE = "https://bluesabre.org/menulibre/" SECTION = "x11/graphics" -LICENSE = "GPLv3" +LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = " \ @@ -9,33 +9,31 @@ DEPENDS = " \ intltool-native \ " -inherit distutils3 gtk-icon-cache distro_features_check +inherit setuptools3_legacy gtk-icon-cache features_check +REQUIRED_DISTRO_FEATURES = "x11 gobject-introspection-data" -REQUIRED_DISTRO_FEATURES = "x11" +SRC_URI = "git://github.com/bluesabre/menulibre.git;protocol=https;branch=master" +SRCREV = "86ee9ad7568128fe9555e54799933b2d3762331a" +S = "${WORKDIR}/git" -SRC_URI = "https://launchpad.net/menulibre/2.2/${PV}/+download/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "8460ea844a5998c5f722bccb5ce8627a" -SRC_URI[sha256sum] = "5b3ef8e6073d584f6accf282fa1eb649185ee42eb22fab70231491c7377d7e8f" +do_compile[noexec] = "1" -do_compile() { -} - -do_install_append() { +do_install:append() { sed -i 's:${D}::g' ${D}${datadir}/applications/menulibre.desktop sed -i 's:share/share:share:g' ${D}${PYTHON_SITEPACKAGES_DIR}/menulibre_lib/menulibreconfig.py } -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/applications \ - ${datadir}/menulibre \ + ${datadir}/metainfo \ ${datadir}/icons \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ gtk+3 \ gtksourceview3 \ python3-pygobject \ - gnome-menus3 \ + gnome-menus \ python3-unixadmin \ python3-psutil \ " diff --git a/meta-xfce/recipes-apps/mousepad/mousepad_0.4.2.bb b/meta-xfce/recipes-apps/mousepad/mousepad_0.4.2.bb deleted file mode 100644 index 4bf10a47bb..0000000000 --- a/meta-xfce/recipes-apps/mousepad/mousepad_0.4.2.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "A simple text editor for Xfce" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "gtk+3 gtksourceview3 xfconf xfce4-dev-tools-native" - -inherit xfce-app gsettings - -SRC_URI[md5sum] = "98d908842d4a93c35756a67d681c08fe" -SRC_URI[sha256sum] = "84c02adfca7f8b33b9466a306ded72fb9f38f93c9edb78660343854c4a3aded7" - -FILES_${PN} += " \ - ${datadir}/glib-2.0/schemas \ - ${datadir}/polkit-1 \ -" diff --git a/meta-xfce/recipes-apps/mousepad/mousepad_0.5.9.bb b/meta-xfce/recipes-apps/mousepad/mousepad_0.5.9.bb new file mode 100644 index 0000000000..1be015bfbb --- /dev/null +++ b/meta-xfce/recipes-apps/mousepad/mousepad_0.5.9.bb @@ -0,0 +1,19 @@ +SUMMARY = "A simple text editor for Xfce" +SECTION = "x11/application" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "gtk+3 gtksourceview4 xfconf xfce4-dev-tools-native" + +inherit xfce-app gsettings mime-xdg + +SRC_URI[sha256sum] = "f108a8c167ec5727266ab67666f10dbd60e972d56ea03944302fdabb2167f473" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[spell] = "--enable-plugin-gspell,--disable-plugin-gspell,gspell" + +FILES:${PN} += " \ + ${datadir}/glib-2.0/schemas \ + ${datadir}/metainfo \ + ${datadir}/polkit-1 \ +" diff --git a/meta-xfce/recipes-apps/orage/orage/0001-drop-setting-is_utc-member-of-icaltimetype.patch b/meta-xfce/recipes-apps/orage/orage/0001-drop-setting-is_utc-member-of-icaltimetype.patch deleted file mode 100644 index 517de5f922..0000000000 --- a/meta-xfce/recipes-apps/orage/orage/0001-drop-setting-is_utc-member-of-icaltimetype.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 5bdf11fe3638d279edcad911906f801751e024da Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 23 Jul 2019 14:22:08 -0700 -Subject: [PATCH] drop setting is_utc member of icaltimetype - -This seems to be gone in libical3 - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/ical-code.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/src/ical-code.c b/src/ical-code.c -index d583140..d8e5543 100644 ---- a/src/ical-code.c -+++ b/src/ical-code.c -@@ -129,7 +129,6 @@ static struct icaltimetype ical_get_current_local_time() - && (strcmp(g_par.local_timezone, "floating") != 0)) - ctime = icaltime_current_time_with_zone(local_icaltimezone); - else { / * use floating time * / -- ctime.is_utc = 0; - ctime.is_date = 0; - ctime.is_daylight = 0; - ctime.zone = NULL; -@@ -2579,7 +2578,6 @@ static struct icaltimetype count_first_alarm_time(xfical_period per - * when counting alarm time. */ - if (rel == ICAL_RELATED_START) { - per.stime.is_date = 0; -- per.stime.is_utc = 1; - per.stime.is_daylight = 0; - per.stime.zone = utc_icaltimezone; - per.stime.hour = 0; -@@ -2588,7 +2586,6 @@ static struct icaltimetype count_first_alarm_time(xfical_period per - } - else { - per.etime.is_date = 0; -- per.etime.is_utc = 1; - per.etime.is_daylight = 0; - per.etime.zone = utc_icaltimezone; - per.etime.hour = 0; -@@ -2613,7 +2610,6 @@ static struct icaltimetype count_next_alarm_time(struct icaltimetype start_time - /* HACK: convert to UTC time so that we can use time arithmetic - * when counting alarm time. */ - start_time.is_date = 0; -- start_time.is_utc = 1; - start_time.is_daylight = 0; - start_time.zone = utc_icaltimezone; - start_time.hour = 0; -@@ -2768,7 +2764,6 @@ static alarm_struct *process_alarm_trigger(icalcomponent *c - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } -@@ -2850,7 +2845,6 @@ orage_message(120, P_N "Alarm rec loop next_start:%s next_alarm:%s per.stime:%s" - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } -@@ -2944,7 +2938,6 @@ orage_message(120, P_N "*****After loop Alarm %s %s", icaltime_as_ical_string(ne - */ - if (icaltime_is_date(per.stime)) { - if (local_icaltimezone != utc_icaltimezone) { -- next_alarm_time.is_utc = 0; - next_alarm_time.is_daylight = 0; - next_alarm_time.zone = local_icaltimezone; - } --- -2.22.0 - diff --git a/meta-xfce/recipes-apps/orage/orage_4.12.1.bb b/meta-xfce/recipes-apps/orage/orage_4.12.1.bb deleted file mode 100644 index 9662b614f8..0000000000 --- a/meta-xfce/recipes-apps/orage/orage_4.12.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Xfce Calender" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88" -DEPENDS = "gtk+ xfce4-panel libical popt" - -inherit xfce-app - -SRC_URI += "file://0001-drop-setting-is_utc-member-of-icaltimetype.patch" - -SRC_URI[md5sum] = "2b7f5d38cb5c6edbcc65d0f52a742e46" -SRC_URI[sha256sum] = "3cf9aa441ae83c8688865f82217025cdf3ebaa152cce4571777b8c2aa8dd9062" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" - -PACKAGES =+ "xfce4-orageclock-plugin" -FILES_${PN} += "${datadir}/dbus-1" -FILES_xfce4-orageclock-plugin = "${libdir}/xfce4/panel/plugins/*.so ${datadir}/xfce4/panel/plugins" -FILES_${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" diff --git a/meta-xfce/recipes-apps/orage/orage_4.16.0.bb b/meta-xfce/recipes-apps/orage/orage_4.16.0.bb new file mode 100644 index 0000000000..d10cdaac49 --- /dev/null +++ b/meta-xfce/recipes-apps/orage/orage_4.16.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "Xfce Calender" +SECTION = "x11/application" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "gtk+ xfce4-panel libical popt" + +inherit xfce-app mime-xdg + +SRC_URI[sha256sum] = "26111a3b6a2007c82f1e0a1e0591b774a0b132f3a7f1cde53d9be661b2f11700" + +PACKAGECONFIG ??= "notify" +PACKAGECONFIG[notify] = "--enable-libnotify,--disable-libnotify,libnotify" + +PACKAGES =+ "xfce4-orageclock-plugin" +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" +FILES:xfce4-orageclock-plugin = "${libdir}/xfce4/panel/plugins/*.so ${datadir}/xfce4/panel/plugins" +FILES:${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" diff --git a/meta-xfce/recipes-apps/ristretto/ristretto_0.10.0.bb b/meta-xfce/recipes-apps/ristretto/ristretto_0.13.1.bb index 9c5bb12e8e..4aac89fe79 100644 --- a/meta-xfce/recipes-apps/ristretto/ristretto_0.10.0.bb +++ b/meta-xfce/recipes-apps/ristretto/ristretto_0.13.1.bb @@ -1,16 +1,15 @@ SUMMARY = "Tiny image-viewer" HOMEPAGE = "https://docs.xfce.org/apps/ristretto/start" SECTION = "x11/application" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=35d145429ad3cbf5308d1dc93f66376b" DEPENDS = "exo libexif libxfce4ui libxfce4util xfconf cairo file" -inherit xfce-app +inherit xfce-app mime-xdg -RRECOMMENDS_${PN} += "tumbler" +RRECOMMENDS:${PN} += "tumbler" -SRC_URI[md5sum] = "4249e14fba78728481d89ce61a8771fc" -SRC_URI[sha256sum] = "16225dd74245eb6e0f82b9c72c6112f161bb8d8b11f3fc77277b7bc3432d4769" +SRC_URI[sha256sum] = "d71affbf15245067124725b153c908a53208c4ca1ba2d4df1ec5a1308d53791e" -FILES_${PN} += "${datadir}/metainfo" +FILES:${PN} += "${datadir}/metainfo" diff --git a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb index 7445cd7c53..ea7e8005ef 100644 --- a/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb +++ b/meta-xfce/recipes-apps/xarchiver/xarchiver_git.bb @@ -2,17 +2,17 @@ SUMMARY = "Lightweight, desktop independent GTK+ archive manager" HOMEPAGE = "http://xarchiver.sourceforge.net" SECTION = "x11" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gtk+3 glib-2.0 xfce4-dev-tools-native intltool-native" -SRC_URI = "git://github.com/ib/xarchiver.git" -SRCREV = "9ab958a4023b62b43972c55a3143ff0722bd88a6" -PV = "0.5.4.14" +SRC_URI = "git://github.com/ib/xarchiver.git;branch=master;protocol=https" +SRCREV = "2f6c91e756678f0723305d8636e8e393c1eef32c" +PV = "0.5.4.17" S = "${WORKDIR}/git" -inherit gettext pkgconfig autotools gtk-icon-cache distro_features_check +inherit gettext pkgconfig autotools gtk-icon-cache features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11" @@ -24,10 +24,10 @@ EXTRA_OECONF += " \ --disable-doc \ " -do_configure_prepend() { +do_configure:prepend() { touch ${S}/NEWS ${S}/AUTHORS } -FILES_${PN} += "${libdir}/thunar-archive-plugin" +FILES:${PN} += "${libdir}/thunar-archive-plugin" -RRECOMMENDS_${PN} = "lzop zip tar bzip2 unzip xz p7zip" +RRECOMMENDS:${PN} = "lzop zip tar bzip2 unzip xz p7zip" diff --git a/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb b/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb index 3a396c0f76..3e3301f748 100644 --- a/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb +++ b/meta-xfce/recipes-apps/xfce-polkit/xfce-polkit_0.3.bb @@ -1,14 +1,14 @@ SUMMARY = "A simple PolicyKit authentication agent for XFCE" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=758b03f872a88c99fc36d50c5932091c" DEPENDS = "libxfce4ui polkit" -inherit xfce-app distro_features_check +inherit xfce-app features_check REQUIRED_DISTRO_FEATURES = "polkit" SRC_URI = " \ - git://github.com/ncopa/${BPN}.git \ + git://github.com/ncopa/${BPN}.git;branch=master;protocol=https \ " SRCREV = "6d3282cc1734c305850d48f5bf4b4d94e88885e9" S = "${WORKDIR}/git" diff --git a/meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-Fix-build-with-meson-0.61.patch b/meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-Fix-build-with-meson-0.61.patch new file mode 100644 index 0000000000..617d175579 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-datetime-setter/files/0001-Fix-build-with-meson-0.61.patch @@ -0,0 +1,26 @@ +From d463b7e9abbbc87ec0e25216a24d9a40d347f1a6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 24 Jan 2022 09:59:02 -0800 +Subject: [PATCH] Fix build with meson >= 0.61 + +Upstream-Status: Submitted [https://github.com/schnitzeltony/xfce4-datetime-setter/pull/3] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + panels/datetime/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build +index 241e177..4356907 100644 +--- a/panels/datetime/meson.build ++++ b/panels/datetime/meson.build +@@ -10,7 +10,6 @@ desktop_in = configure_file( + ) + + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop_in, + output: 'xfce-datetime.desktop', +-- +2.34.1 + diff --git a/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb b/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb index 4d128ac512..6bcfc4ba43 100644 --- a/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +++ b/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb @@ -1,22 +1,23 @@ DESCRIPTION = "A fork of (early) gnome-control-center datetime panel for XFCE. \ It is based upon GTK3 and embedds into recent xfce4-settings." HOMEPAGE = "https://github.com/schnitzeltony/xfce4-datetime-setter" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" DEPENDS = "glib-2.0-native libxfce4ui" -SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https \ +SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https;branch=master \ file://fix-inner-dependency.patch \ + file://0001-Fix-build-with-meson-0.61.patch \ " SRCREV = "5c7a73a3824b03b91719e05e2604b97c7a72d50f" S = "${WORKDIR}/git" -inherit gettext meson distro_features_check +inherit gettext meson features_check pkgconfig REQUIRED_DISTRO_FEATURES = "systemd x11" -FILES_${PN} += "${datadir}/icons/hicolor" +FILES:${PN} += "${datadir}/icons/hicolor" -RDEPENDS_${PN} = "tzdata" +RDEPENDS:${PN} = "tzdata" diff --git a/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch b/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch new file mode 100644 index 0000000000..719267fd16 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-notifyd/files/xfce4-notifyd-get-var-abs-path.patch @@ -0,0 +1,41 @@ +Native pkg_config only return basename of the variable queried. Invoke `which` +to get the absolute path. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 0f49e2b..a589147 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -116,7 +116,7 @@ AC_MSG_CHECKING([for gdbus-codegen]) + if test x"$GDBUS_CODEGEN" = x""; then + GDBUS_CODEGEN=`$PKG_CONFIG --variable=gdbus_codegen gio-2.0` + fi +-if test -x "$GDBUS_CODEGEN"; then ++if test -x "$(which $GDBUS_CODEGEN)"; then + AC_MSG_RESULT([$GDBUS_CODEGEN]) + else + AC_MSG_ERROR([could not find gdbus-codegen in \$PATH. You can run +@@ -129,7 +129,7 @@ AC_MSG_CHECKING([for glib-compile-resources]) + if test x"$GLIB_COMPILE_RESOURCES" = x""; then + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` + fi +-if test -x "$GLIB_COMPILE_RESOURCES"; then ++if test -x "$(which $GLIB_COMPILE_RESOURCES)"; then + AC_MSG_RESULT([$GLIB_COMPILE_RESOURCES]) + else + AC_MSG_ERROR([could not find glib-compile-resources in \$PATH. You can run +@@ -142,7 +142,7 @@ AC_MSG_CHECKING([for glib-genmarshal]) + if test x"$GLIB_GENMARSHAL" = x""; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + fi +-if test -x "$GLIB_GENMARSHAL"; then ++if test -x "$(which $GLIB_GENMARSHAL)"; then + AC_MSG_RESULT([$GLIB_GENMARSHAL]) + else + AC_MSG_ERROR([could not find glib-genmarshal in \$PATH. You can run diff --git a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.4.bb b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb index 06ab0dfeb4..7dbd90c188 100644 --- a/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.4.4.bb +++ b/meta-xfce/recipes-apps/xfce4-notifyd/xfce4-notifyd_0.8.2.bb @@ -1,10 +1,10 @@ SUMMARY = "Easily themable notification daemon with transparency effects" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-notifyd" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +HOMEPAGE = "https://docs.xfce.org/apps/notifyd/start" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + DEPENDS = " \ - dbus \ - dbus-glib \ + glib-2.0-native \ libnotify \ libxfce4util \ libxfce4ui \ @@ -14,18 +14,19 @@ DEPENDS = " \ inherit xfce-app -SRC_URI[md5sum] = "9614d4f7c0790e8ab24e55896a44a8ac" -SRC_URI[sha256sum] = "090571acf94c423003426cb779fb23e8545c68bab6485563b589c7def8a21b55" +SRC_URI:append = " file://xfce4-notifyd-get-var-abs-path.patch" + +SRC_URI[sha256sum] = "e3a28adb08daa1411135142a0d421e4d6050c4035a4e513a673a59460ff2ae84" # Avoid trouble with other desktops e.g KDE which also ships dbus service named # org.freedesktop.Notifications EXTRA_OECONF = "--disable-dbus-start-daemon" -do_compile_prepend() { +do_compile:prepend() { mkdir -p xfce4-notifyd xfce4-notifyd-config } -FILES_${PN} += " \ +FILES:${PN} += " \ ${systemd_user_unitdir} \ ${datadir}/xfce4 \ ${datadir}/themes \ diff --git a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/not-create-link-to-locale.patch b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/not-create-link-to-locale.patch new file mode 100644 index 0000000000..b5421f6f74 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles/not-create-link-to-locale.patch @@ -0,0 +1,22 @@ +It is useless to create a link to $(PREFIX)/share/locale that there is no +reference to $(PREFIX)/share/$(APPNAME)/locale in source code. + +Upstream-Status: Submitted [https://bugzilla.xfce.org/show_bug.cgi?id=16693] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + Makefile.in.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile.in.in b/Makefile.in.in +index c0ce866..c2f26fe 100644 +--- a/Makefile.in.in ++++ b/Makefile.in.in +@@ -70,7 +70,6 @@ install: all xfce4-panel-profiles.1 + install data/metainfo/*.xml $(DESTDIR)/$(PREFIX)/share/metainfo + + cp -rf locale $(DESTDIR)/$(PREFIX)/share +- ln -sf $(PREFIX)/share/locale $(DESTDIR)/$(PREFIX)/share/$(APPNAME)/locale + + install -d $(DESTDIR)/$(MANDIR)/man1 + install xfce4-panel-profiles.1 $(DESTDIR)/$(MANDIR)/man1 diff --git a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb new file mode 100644 index 0000000000..feb9121609 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.13.bb @@ -0,0 +1,29 @@ +SUMMARY = "Backup, restore, import, and export panel layouts" +SECTION = "x11/application" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +inherit python3native gettext gtk-icon-cache features_check + +REQUIRED_DISTRO_FEATURES = "x11 gobject-introspection-data" + +DEPENDS += "intltool-native" + +SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/1.0/${BP}.tar.bz2 \ + file://not-create-link-to-locale.patch \ + " +SRC_URI[sha256sum] = "bc387c13f94109422dc72b0fcb919b0dc11619ba589d03e492252b0d2513b170" + +do_configure() { + # special configure - no autotools... + ./configure --prefix=${prefix} +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install + sed -i 's:${PYTHON}:python3:g' ${D}${bindir}/xfce4-panel-profiles +} + +FILES:${PN} += "${datadir}/metainfo" + +RDEPENDS:${PN} += "python3-pygobject python3-pexpect" diff --git a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.8.bb b/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.8.bb deleted file mode 100644 index 5fa2a7bce5..0000000000 --- a/meta-xfce/recipes-apps/xfce4-panel-profiles/xfce4-panel-profiles_1.0.8.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Backup, restore, import, and export panel layouts" -SECTION = "x11/application" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -inherit python3native gettext distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -DEPENDS += "intltool-native" - -SRC_URI = "http://archive.xfce.org/src/apps/${BPN}/1.0/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "bc75a143423fba3a82f114f47e86580c" -SRC_URI[sha256sum] = "a69e20f5e637319e14898b5c13ff7ba31d001a6e38e7516d70dbfd7600ad72db" - -do_configure() { - # special configure - no autotools... - ./configure --prefix=${prefix} -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install - sed -i 's:${PYTHON}:python3:g' ${D}${bindir}/xfce4-panel-profiles -} - -FILES_${PN} += "${datadir}/metainfo" - -RDEPENDS_${PN} += "python3-pygobject python3-pexpect" diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch index f726064e21..eabcaaae69 100644 --- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch +++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch @@ -6,11 +6,15 @@ Upstream-Status: Inappropriate [cross compile specific] Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- + configure.ac | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + diff --git a/configure.ac b/configure.ac -index f0ec537..05c393d 100644 +index 6f149bb..3890677 100644 --- a/configure.ac +++ b/configure.ac -@@ -230,9 +230,9 @@ dnl --------------------------------------------------------------------------- +@@ -237,9 +237,9 @@ dnl --------------------------------------------------------------------------- # AC_DEFUN([AC_CHECK_X_HEADER], [ ac_save_CPPFLAGS="$CPPFLAGS" @@ -23,7 +27,7 @@ index f0ec537..05c393d 100644 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], [ +@@ -248,9 +248,9 @@ AC_DEFUN([AC_CHECK_X_HEADER], [ # AC_DEFUN([AC_TRY_X_COMPILE], [ ac_save_CPPFLAGS="$CPPFLAGS" @@ -34,9 +38,9 @@ index f0ec537..05c393d 100644 +# CPPFLAGS="$CPPFLAGS -I$includedir" +# fi CPPFLAGS="$CPPFLAGS $X_CFLAGS" - AC_TRY_COMPILE([$1], [$2], [$3], [$4]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [$3], [$4]) CPPFLAGS="$ac_save_CPPFLAGS"]) -@@ -257,15 +257,15 @@ AC_DEFUN([AC_CHECK_X_LIB], [ +@@ -264,15 +264,15 @@ AC_DEFUN([AC_CHECK_X_LIB], [ ac_save_LDFLAGS="$LDFLAGS" # ac_save_LIBS="$LIBS" diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch deleted file mode 100644 index 94cad23f8e..0000000000 --- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch +++ /dev/null @@ -1,14 +0,0 @@ -'@include' is not a standard sysntax and not supported by oe. - -Upstream-Status: Submitted [https://bugzilla.xfce.org/show_bug.cgi?id=15626] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -diff --git a/data/xfce4-screensaver.common-auth b/data/xfce4-screensaver.common-auth -index a9fd9ce..3bfea70 100644 ---- a/data/xfce4-screensaver.common-auth -+++ b/data/xfce4-screensaver.common-auth -@@ -1,2 +1,2 @@ --@include common-auth -+auth include common-auth - auth optional pam_gnome_keyring.so diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.5.bb b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.18.1.bb index 4a1aae7648..2c5cba0d8f 100644 --- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.5.bb +++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.18.1.bb @@ -3,24 +3,22 @@ DESCRIPTION = "Xfce screensaver is a screen saver and locker that aims to have s HOMEPAGE = "https://git.xfce.org/apps/xfce4-screensaver/about/" SECTION = "x11/application" -LICENSE = "GPLv2+ & LGPLv2+ " +LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later " LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ " -DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf" +DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf libwnck3" inherit xfce-app -SRC_URI_append = " \ - file://fix-cross-compile.patch \ - file://fix-pam-config.patch \ -" -SRC_URI[md5sum] = "982f9a355456320933ec08313523a567" -SRC_URI[sha256sum] = "fdecf0fc432b59defba2dd706051696d47227ca0744c7971014021190126f2d5" +SRC_URI:append = " file://fix-cross-compile.patch" +SRC_URI[sha256sum] = "b731e8abd68a18cc5d3b523351aa8f9f293c9f63290c1781c9155259deb04a5c" -do_install_append() { +do_install:append() { install -D -m 0644 ${S}/data/xfce4-screensaver.common-auth ${D}${sysconfdir}/pam.d/xfce4-screensaver } -FILES_${PN} += "${datadir}/dbus-1 ${datadir}/desktop-directories" +FILES:${PN} += "${datadir}/dbus-1 ${datadir}/desktop-directories" + +RDEPENDS:${PN} += "python3-core" diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.10.3.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.10.3.bb new file mode 100644 index 0000000000..10427dab32 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.10.3.bb @@ -0,0 +1,21 @@ +SUMMARY = "Application to take screenshots" +HOMEPAGE = "https://docs.xfce.org/apps/xfce4-screenshooter/start" +SECTION = "x11/application" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+3 glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11 libxml-parser-perl-native" + +inherit xfce-app perlnative + +SRC_URI[sha256sum] = "a454159847becfeca274a5b58c0e5817d4a260a29345a37bbc3b4ff46f8f3818" + +do_compile:prepend() { + mkdir -p lib + mkdir -p src panel-plugin +} + +FILES:${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/xfce4/panel/plugins \ + ${libdir}/xfce4/panel/plugins \ +" diff --git a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.7.bb b/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.7.bb deleted file mode 100644 index a0de630040..0000000000 --- a/meta-xfce/recipes-apps/xfce4-screenshooter/xfce4-screenshooter_1.9.7.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Application to take screenshots" -HOMEPAGE = "http://goodies.xfce.org/projects/applications/xfce4-screenshooter" -SECTION = "x11/application" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d791728a073bc009b4ffaf00b7599855" -DEPENDS = "xfce4-panel libxfce4util libxfce4ui gdk-pixbuf gtk+ glib-2.0 libsoup-2.4 exo libxfixes xext virtual/libx11" - -inherit xfce-app - -SRC_URI[md5sum] = "9b63c0fa7cbde8ec4e6cacb75fc44b65" -SRC_URI[sha256sum] = "0f7161053a23a6413376f4d17db6b774d4849384a9b1ffe01fdb2b0035a070d1" - -do_compile_prepend() { - mkdir -p lib - mkdir -p src panel-plugin -} - -FILES_${PN} += " \ - ${datadir}/metainfo \ - ${datadir}/xfce4/panel/plugins \ - ${libdir}/xfce4/panel/plugins \ -" diff --git a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.2.bb b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.2.bb deleted file mode 100644 index f3a59c96ce..0000000000 --- a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.2.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Easy to use task manager" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit xfce-app - -DEPENDS += "gtk+3 cairo libwnck libxmu xfce4-dev-tools-native exo-native" - -SRC_URI[md5sum] = "6578625ffbe069b138533ff5e77df734" -SRC_URI[sha256sum] = "e49a61c819a4fd9286a65ae61605984f327c8b26cf939289f644e656bfa20e13" diff --git a/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.5.bb b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.5.bb new file mode 100644 index 0000000000..802d6af4a4 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-taskmanager/xfce4-taskmanager_1.5.5.bb @@ -0,0 +1,9 @@ +SUMMARY = "Easy to use task manager" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit xfce-app + +DEPENDS += "gtk+3 cairo libwnck libxfce4ui libxmu xfce4-dev-tools-native" + +SRC_URI[sha256sum] = "f64f01ba241a0b8bbf2ed3274e5decc2313c9f8b0e4d160db3ba69b331558ae5" diff --git a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.8.bb b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.8.bb deleted file mode 100644 index ebc046b78f..0000000000 --- a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_0.8.8.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Terminal emulator for the Xfce desktop environment" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui" - -inherit xfce-app - -FILES_${PN} += "${datadir}/xfce4 \ - ${datadir}/gnome-control-center" - -SRC_URI[md5sum] = "4295d4d783f6d6dfe92f5bb15d96f6c6" -SRC_URI[sha256sum] = "8fba6a60d3a0fee07417ad7c36bf78cc45be1b27f0759e125051aa73f08487fd" - -RRECOMMENDS_${PN} += "vte-prompt" diff --git a/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.4.bb b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.4.bb new file mode 100644 index 0000000000..edb0c614ec --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-terminal/xfce4-terminal_1.0.4.bb @@ -0,0 +1,15 @@ +SUMMARY = "Terminal emulator for the Xfce desktop environment" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" +DEPENDS = "glib-2.0 gtk+3 vte libxfce4ui gtk-doc-native" + +inherit xfce-app + +FILES:${PN} += " \ + ${datadir}/xfce4 \ + ${datadir}/gnome-control-center \ +" + +SRC_URI[sha256sum] = "78e55957af7c6fc1f283e90be33988661593a4da98383da1b0b54fdf6554baf4" + +RRECOMMENDS:${PN} += "vte-prompt" |