diff options
Diffstat (limited to 'meta-oe/recipes-graphics/openbox')
3 files changed, 109 insertions, 15 deletions
diff --git a/meta-oe/recipes-graphics/openbox/files/0001-Fix-function-protype-visibility.patch b/meta-oe/recipes-graphics/openbox/files/0001-Fix-function-protype-visibility.patch new file mode 100644 index 0000000000..344c5d149b --- /dev/null +++ b/meta-oe/recipes-graphics/openbox/files/0001-Fix-function-protype-visibility.patch @@ -0,0 +1,94 @@ +From 941d5ff3426e68cb9bcb4ae86066124cb2535b69 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Sep 2022 12:32:20 -0700 +Subject: [PATCH] Fix function protype visibility + +Include ctye.h for toupper + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/appearance.c | 1 + + src/desktops.c | 2 +- + src/desktops.h | 2 +- + src/main.c | 1 + + src/moveresize.c | 2 +- + src/moveresize.h | 2 +- + 6 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/appearance.c b/src/appearance.c +index 4fb3f0c..ee55661 100644 +--- a/src/appearance.c ++++ b/src/appearance.c +@@ -20,6 +20,7 @@ + #include "main.h" + #include "tree.h" + #include "preview_update.h" ++#include <ctype.h> /* for toupper */ + + static gboolean mapping = FALSE; + +diff --git a/src/desktops.c b/src/desktops.c +index 8297f00..27ca514 100644 +--- a/src/desktops.c ++++ b/src/desktops.c +@@ -38,7 +38,7 @@ static void on_desktop_names_cell_edited(GtkCellRendererText *cell, + gpointer data); + static void enable_stuff(); + +-void desktops_setup_tab() ++void desktops_setup_tab(void) + { + GtkWidget *w; + GtkCellRenderer *render; +diff --git a/src/desktops.h b/src/desktops.h +index 1ba3e36..446bfbb 100644 +--- a/src/desktops.h ++++ b/src/desktops.h +@@ -24,5 +24,5 @@ + + void desktops_setup_num(GtkWidget *w); + void desktops_setup_names(GtkWidget *w); +- ++void desktops_setup_tab(void); + #endif +diff --git a/src/main.c b/src/main.c +index d7e3446..0176035 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -28,6 +28,7 @@ + #include "dock.h" + #include "preview_update.h" + #include "gettext.h" ++#include "moveresize.h" + + #include <gdk/gdkx.h> + #define SN_API_NOT_YET_FROZEN +diff --git a/src/moveresize.c b/src/moveresize.c +index c6fb3dd..bb52729 100644 +--- a/src/moveresize.c ++++ b/src/moveresize.c +@@ -37,7 +37,7 @@ static gboolean mapping = FALSE; + static void enable_stuff(); + static void write_fixed_position(const gchar *coord); + +-void moveresize_setup_tab() ++void moveresize_setup_tab(void) + { + GtkWidget *w, *w1, *w2, *w3; + GtkSizeGroup *group; +diff --git a/src/moveresize.h b/src/moveresize.h +index 82ecc96..8faf526 100644 +--- a/src/moveresize.h ++++ b/src/moveresize.h +@@ -20,6 +20,6 @@ + #ifndef obconf__moveresize_h + #define obconf__moveresize_h + +-void moveresize_setup_tab(); ++void moveresize_setup_tab(void); + + #endif +-- +2.37.3 + diff --git a/meta-oe/recipes-graphics/openbox/obconf_git.bb b/meta-oe/recipes-graphics/openbox/obconf_git.bb index 53c5898211..1210af70ea 100644 --- a/meta-oe/recipes-graphics/openbox/obconf_git.bb +++ b/meta-oe/recipes-graphics/openbox/obconf_git.bb @@ -1,19 +1,19 @@ SUMMARY = "Openbox configuration tool" -AUTHOR = "Dana Jansens & Tim Riley & Javeed Shaikh" HOMEPAGE = "http://openbox.org/wiki/ObConf:About" SECTION = "x11/wm" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = " \ openbox \ startup-notification \ gtk+3 \ " -PV = "2.0.4+git${SRCPV}" +PV = "2.0.4+git" SRCREV = "63ec47c5e295ad4f09d1df6d92afb7e10c3fec39" SRC_URI = " \ - git://git.openbox.org/dana/obconf \ + git://git.openbox.org/dana/obconf;branch=master \ + file://0001-Fix-function-protype-visibility.patch \ " S = "${WORKDIR}/git" @@ -24,10 +24,10 @@ REQUIRED_DISTRO_FEATURES = "x11" EXTRA_AUTORECONF = "" -FILES_${PN} += "\ +FILES:${PN} += "\ ${datadir}/mime \ " -do_install_append () { +do_install:append () { rm -rf ${D}${datadir}/mimelnk } diff --git a/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb b/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb index e269a264f8..9a15077316 100644 --- a/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb +++ b/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb @@ -1,7 +1,7 @@ SUMMARY = "openbox Window Manager" SECTION = "x11/wm" -DEPENDS = "glib-2.0 pango libxml2 virtual/libx11 libcroco librsvg gdk-pixbuf" -LICENSE = "GPLv2+" +DEPENDS = "glib-2.0 pango libxml2 virtual/libx11 librsvg gdk-pixbuf" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = " \ @@ -17,7 +17,7 @@ inherit autotools gettext update-alternatives pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -ALTERNATIVE_${PN}-core = "x-window-manager x-session-manager" +ALTERNATIVE:${PN}-core = "x-window-manager x-session-manager" ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/openbox" ALTERNATIVE_PRIORITY[x-window-manager] = "10" ALTERNATIVE_TARGET[x-session-manager] = "${bindir}/openbox-session" @@ -34,25 +34,25 @@ PACKAGES =+ "${PN}-core ${PN}-lxde ${PN}-gnome ${PN}-config" PACKAGES_DYNAMIC += "^${PN}-theme-.*" -python populate_packages_prepend() { +python populate_packages:prepend() { theme_dir = d.expand('${datadir}/themes/') theme_name = d.expand('${PN}-theme-%s') do_split_packages(d, theme_dir, '(.*)', theme_name, '${PN} theme for %s', extra_depends='', allow_dirs=True) } -FILES_${PN}-core = "${bindir}/openbox ${bindir}/openbox-session ${libdir}/*${SOLIBS}" +FILES:${PN}-core = "${bindir}/openbox ${bindir}/openbox-session ${libdir}/*${SOLIBS}" -FILES_${PN}-lxde += "${datadir}/lxde/ \ +FILES:${PN}-lxde += "${datadir}/lxde/ \ ${datadir}/lxpanel \ ${datadir}/xsessions \ ${datadir}/icons" -FILES_${PN}-gnome += " \ +FILES:${PN}-gnome += " \ ${bindir}/openbox-gnome-session \ ${datadir}/gnome \ ${datadir}/gnome-session \ " -FILES_${PN}-config += "${sysconfdir}" +FILES:${PN}-config += "${sysconfdir}" -RDEPENDS_${PN} += "${PN}-core ${PN}-config ${PN}-theme-clearlooks python3 python3-shell pyxdg" +RDEPENDS:${PN} += "${PN}-core ${PN}-config ${PN}-theme-clearlooks python3 python3-shell pyxdg" |