diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 20:05:37 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-23 04:26:31 +0300 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /meta-openembedded/meta-xfce/recipes-extended | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.xz |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-xfce/recipes-extended')
7 files changed, 707 insertions, 0 deletions
diff --git a/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb new file mode 100644 index 0000000000..8f622bf6f8 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-extended/imsettings/imsettings_1.7.3.bb @@ -0,0 +1,31 @@ +SUMMARY = "Delivery framework for general Input Method configuration" +DESCRIPTION = "IMSettings is a framework that delivers Input Method \ +settings and applies the changes so they take effect \ +immediately without any need to restart applications \ +or the desktop. \ +This package contains the core DBus services and some utilities." +HOMEPAGE = "http://code.google.com/p/imsettings/" +SECTION = "Applications/System" + +inherit autotools gtk-doc gobject-introspection distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "https://bitbucket.org/tagoh/imsettings/downloads/${BPN}-${PV}.tar.bz2 \ + " + +SRC_URI[md5sum] = "c6c65a2b2654fe9dfe9ab2e8b80c079a" +SRC_URI[sha256sum] = "196d3a74cef254ff812c32682d1818d740e36a68b976fef9e99748d23a71a71a" + +LICENSE = "LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +EXTRA_OECONF = "--with-xinputsh=50-xinput.sh \ + --disable-static \ + " + +DEPENDS = "gtk+ gconf libnotify dbus-glib libgxim xfconf intltool-native" + +RDEPENDS_${PN} += "bash" + +FILES_${PN} += "${datadir}/dbus-1/* ${datadir}/gir-1.0/* ${libdir}/girepository-1.0/*" diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch new file mode 100644 index 0000000000..2b5eda0d13 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch @@ -0,0 +1,27 @@ +From f39bcd5af79aa3efe2cecb2212793c5b596890a8 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 18 Feb 2016 17:40:45 +0200 +Subject: [PATCH] Makefile.am: use $(LIBTOOL) instead of hardcoded libtool name + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + unique/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unique/Makefile.am b/unique/Makefile.am +index 6475a87..734f431 100644 +--- a/unique/Makefile.am ++++ b/unique/Makefile.am +@@ -114,7 +114,7 @@ Unique-1.0.gir: $(INTROSPECTION_SCANNER) libunique-1.0.la + --include=GObject-2.0 \ + --include=Gtk-2.0 \ + --library=libunique-1.0.la \ +- --libtool="$(top_builddir)/libtool" \ ++ --libtool="$(LIBTOOL)" \ + --pkg gobject-2.0 \ + --pkg gtk+-2.0 \ + --output $@ \ +-- +2.7.0 + diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch new file mode 100644 index 0000000000..7f9fdf3971 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/0001-test-unique-Add-format-qualifier-s-for-string.patch @@ -0,0 +1,32 @@ +From 37632aca00d48c53e91f08bc7435c721ba81b2cd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 30 Mar 2017 14:32:55 -0700 +Subject: [PATCH] test-unique: Add format qualifier %s for string + +Fixes potential security issues that compiler flags + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/test-unique.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/test-unique.c b/tests/test-unique.c +index b7cde45..82ee81b 100644 +--- a/tests/test-unique.c ++++ b/tests/test-unique.c +@@ -82,10 +82,10 @@ app_message_cb (UniqueApp *app, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_CLOSE, +- title); ++ "%s",title); + if (message) + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), +- message); ++ "%s",message); + + gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE); + +-- +2.12.1 + diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch new file mode 100644 index 0000000000..46a5c62e4f --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/build.patch @@ -0,0 +1,421 @@ +Upstream-Status: Backport [http://git.gnome.org/browse/unique/commit/?h=unique-1.1&id=f75ca2d7aad7d27686acca6090c1c569a79d7e63] +Signed-off-By: Ross Burton <ross.burton@intel.com> + +From f75ca2d7aad7d27686acca6090c1c569a79d7e63 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi <ebassi@gnome.org> +Date: Sat, 08 May 2010 11:17:21 +0000 +Subject: build: Update the build environment + +Require autoconf 2.63, automake 1.11 and libtool 2.2.6 to remove Shave. + +Also bump up the requirement for gobject-introspection to 0.6.7. +--- +diff --git a/build/autotools/Makefile.am b/build/autotools/Makefile.am +index 5f35b85..b78428f 100644 +--- a/build/autotools/Makefile.am ++++ b/build/autotools/Makefile.am +@@ -1,7 +1,4 @@ + EXTRA_DIST = \ +- shave-libtool.in \ +- shave.in \ +- shave.m4 \ + as-compiler-flag.m4 \ + introspection.m4 \ + Makefile.am.enums \ +diff --git a/build/autotools/Makefile.am.silent b/build/autotools/Makefile.am.silent +index 249f6af..8576846 100644 +--- a/build/autotools/Makefile.am.silent ++++ b/build/autotools/Makefile.am.silent +@@ -1,10 +1,5 @@ + # custom rules for quiet builds + +-if USE_SHAVE +-QUIET_GEN = $(Q:@=@echo ' GEN '$@;) +-QUIET_LN = $(Q:@=@echo ' LN '$@;) +-QUIET_RM = $(Q:@=@echo ' RM '$@;) +-else + QUIET_GEN = $(AM_V_GEN) + + QUIET_LN = $(QUIET_LN_$(V)) +@@ -14,4 +9,3 @@ QUIET_LN_0 = @echo ' LN '$@; + QUIET_RM = $(QUIET_RM_$(V)) + QUIET_RM_ = $(QUIET_RM_$(AM_DEFAULT_VERBOSITY)) + QUIET_RM_0 = @echo ' RM '$@; +-endif # USE_SHAVE +diff --git a/build/autotools/introspection.m4 b/build/autotools/introspection.m4 +index f9ce49c..589721c 100644 +--- a/build/autotools/introspection.m4 ++++ b/build/autotools/introspection.m4 +@@ -59,12 +59,18 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" ++ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` ++ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` ++ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + fi + AC_SUBST(INTROSPECTION_SCANNER) + AC_SUBST(INTROSPECTION_COMPILER) + AC_SUBST(INTROSPECTION_GENERATE) + AC_SUBST(INTROSPECTION_GIRDIR) + AC_SUBST(INTROSPECTION_TYPELIBDIR) ++ AC_SUBST(INTROSPECTION_CFLAGS) ++ AC_SUBST(INTROSPECTION_LIBS) ++ AC_SUBST(INTROSPECTION_MAKEFILE) + + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") + ]) +diff --git a/build/autotools/shave-libtool.in b/build/autotools/shave-libtool.in +deleted file mode 100644 +index 1f3a720..0000000 +--- a/build/autotools/shave-libtool.in ++++ b/dev/null +@@ -1,69 +0,0 @@ +-#!/bin/sh +- +-# we need sed +-SED=@SED@ +-if test -z "$SED" ; then +-SED=sed +-fi +- +-lt_unmangle () +-{ +- last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` +-} +- +-# the real libtool to use +-LIBTOOL="$1" +-shift +- +-# if 1, don't print anything, the underlaying wrapper will do it +-pass_though=0 +- +-# scan the arguments, keep the right ones for libtool, and discover the mode +-preserved_args= +-while test "$#" -gt 0; do +- opt="$1" +- shift +- +- case $opt in +- --mode=*) +- mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` +- preserved_args="$preserved_args $opt" +- ;; +- -o) +- lt_output="$1" +- preserved_args="$preserved_args $opt" +- ;; +- *) +- preserved_args="$preserved_args $opt" +- ;; +- esac +-done +- +-case "$mode" in +-compile) +- # shave will be called and print the actual CC/CXX/LINK line +- preserved_args="$preserved_args --shave-mode=$mode" +- pass_though=1 +- ;; +-link) +- preserved_args="$preserved_args --shave-mode=$mode" +- Q=" LINK " +- ;; +-*) +- # let's u +- # echo "*** libtool: Unimplemented mode: $mode, fill a bug report" +- ;; +-esac +- +-lt_unmangle "$lt_output" +-output=$last_result +- +-if test -z $V; then +- if test $pass_though -eq 0; then +- echo "$Q$output" +- fi +- $LIBTOOL --silent $preserved_args +-else +- echo $LIBTOOL $preserved_args +- $LIBTOOL $preserved_args +-fi +diff --git a/build/autotools/shave.in b/build/autotools/shave.in +deleted file mode 100644 +index 5c16f27..0000000 +--- a/build/autotools/shave.in ++++ b/dev/null +@@ -1,79 +0,0 @@ +-#!/bin/sh +- +-# we need sed +-SED=@SED@ +-if test -z "$SED" ; then +-SED=sed +-fi +- +-lt_unmangle () +-{ +- last_result=`echo $1 | $SED -e 's#.libs/##' -e 's#[0-9a-zA-Z_\-\.]*_la-##'` +-} +- +-# the tool to wrap (cc, cxx, ar, ranlib, ..) +-tool="$1" +-shift +- +-# the reel tool (to call) +-REEL_TOOL="$1" +-shift +- +-pass_through=0 +-preserved_args= +-while test "$#" -gt 0; do +- opt="$1" +- shift +- +- case $opt in +- --shave-mode=*) +- mode=`echo $opt | $SED -e 's/[-_a-zA-Z0-9]*=//'` +- ;; +- -o) +- lt_output="$1" +- preserved_args="$preserved_args $opt" +- ;; +- *) +- preserved_args="$preserved_args $opt" +- ;; +- esac +-done +- +-# mode=link is handled in the libtool wrapper +-case "$mode,$tool" in +-link,*) +- pass_through=1 +- ;; +-*,cxx) +- Q=" CXX " +- ;; +-*,cc) +- Q=" CC " +- ;; +-*,fc) +- Q=" FC " +- ;; +-*,f77) +- Q=" F77 " +- ;; +-*,objc) +- Q=" OBJC " +- ;; +-*,*) +- # should not happen +- Q=" CC " +- ;; +-esac +- +-lt_unmangle "$lt_output" +-output=$last_result +- +-if test -z $V; then +- if test $pass_through -eq 0; then +- echo "$Q$output" +- fi +- $REEL_TOOL $preserved_args +-else +- echo $REEL_TOOL $preserved_args +- $REEL_TOOL $preserved_args +-fi +diff --git a/build/autotools/shave.m4 b/build/autotools/shave.m4 +deleted file mode 100644 +index 0a3509e..0000000 +--- a/build/autotools/shave.m4 ++++ b/dev/null +@@ -1,77 +0,0 @@ +-dnl Make automake/libtool output more friendly to humans +-dnl Damien Lespiau <damien.lespiau@gmail.com> +-dnl +-dnl SHAVE_INIT([shavedir],[default_mode]) +-dnl +-dnl shavedir: the directory where the shave scripts are, it defaults to +-dnl $(top_builddir) +-dnl default_mode: (enable|disable) default shave mode. This parameter +-dnl controls shave's behaviour when no option has been +-dnl given to configure. It defaults to disable. +-dnl +-dnl * SHAVE_INIT should be called late in your configure.(ac|in) file (just +-dnl before AC_CONFIG_FILE/AC_OUTPUT is perfect. This macro rewrites CC and +-dnl LIBTOOL, you don't want the configure tests to have these variables +-dnl re-defined. +-dnl * This macro requires GNU make's -s option. +- +-AC_DEFUN([_SHAVE_ARG_ENABLE], +-[ +- AC_ARG_ENABLE([shave], +- AS_HELP_STRING( +- [--enable-shave], +- [use shave to make the build pretty [[default=$1]]]),, +- [enable_shave=$1] +- ) +-]) +- +-AC_DEFUN([SHAVE_INIT], +-[ +- dnl you can tweak the default value of enable_shave +- m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)]) +- +- if test x"$enable_shave" = xyes; then +- dnl where can we find the shave scripts? +- m4_if([$1],, +- [shavedir="$ac_pwd"], +- [shavedir="$ac_pwd/$1"]) +- AC_SUBST(shavedir) +- +- dnl make is now quiet +- AC_SUBST([MAKEFLAGS], [-s]) +- AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`']) +- +- dnl we need sed +- AC_CHECK_PROG(SED,sed,sed,false) +- +- dnl substitute libtool +- SHAVE_SAVED_LIBTOOL=$LIBTOOL +- LIBTOOL="${SHELL} ${shavedir}/shave-libtool '${SHAVE_SAVED_LIBTOOL}'" +- AC_SUBST(LIBTOOL) +- +- dnl substitute cc/cxx +- SHAVE_SAVED_CC=$CC +- SHAVE_SAVED_CXX=$CXX +- SHAVE_SAVED_FC=$FC +- SHAVE_SAVED_F77=$F77 +- SHAVE_SAVED_OBJC=$OBJC +- CC="${SHELL} ${shavedir}/shave cc ${SHAVE_SAVED_CC}" +- CXX="${SHELL} ${shavedir}/shave cxx ${SHAVE_SAVED_CXX}" +- FC="${SHELL} ${shavedir}/shave fc ${SHAVE_SAVED_FC}" +- F77="${SHELL} ${shavedir}/shave f77 ${SHAVE_SAVED_F77}" +- OBJC="${SHELL} ${shavedir}/shave objc ${SHAVE_SAVED_OBJC}" +- AC_SUBST(CC) +- AC_SUBST(CXX) +- AC_SUBST(FC) +- AC_SUBST(F77) +- AC_SUBST(OBJC) +- +- V=@ +- else +- V=1 +- fi +- Q='$(V:1=)' +- AC_SUBST(V) +- AC_SUBST(Q) +-]) +- +diff --git a/configure.ac b/configure.ac +index a3ed3ee..bc3163a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,7 +14,7 @@ m4_define([unique_api_version], [1.0]) + # This is the X.Y used in the protocol negotiation + m4_define([unique_protocol_version], [1.0]) + +-AC_PREREQ([2.59]) ++AC_PREREQ([2.63]) + + AC_INIT([unique], [unique_version], + [http://bugzilla.gnome.org/enter_bug.cgi?product=libunique], +@@ -23,9 +23,21 @@ AC_INIT([unique], [unique_version], + AC_CONFIG_SRCDIR([unique/unique.h]) + AC_CONFIG_MACRO_DIR([build/autotools]) + +-AM_INIT_AUTOMAKE([1.10]) ++AM_INIT_AUTOMAKE([1.11 no-define -Wno-portability dist-bzip2]) + AM_CONFIG_HEADER([config.h]) + ++AM_SILENT_RULES([yes]) ++ ++AC_PROG_CC_C_O ++ ++AM_PATH_GLIB_2_0 ++ ++LT_PREREQ([2.2.6]) ++LT_INIT([disable-static]) ++ ++# Honor aclocal flags ++ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" ++ + # version symbols + UNIQUE_MAJOR_VERSION=unique_major_version + UNIQUE_MINOR_VERSION=unique_minor_version +@@ -49,21 +61,6 @@ UNIQUE_LT_CURRENT_MINUS_AGE=m4_eval(lt_current - lt_age) + AC_SUBST(UNIQUE_LT_VERSION_INFO) + AC_SUBST(UNIQUE_LT_CURRENT_MINUS_AGE) + +-AC_ISC_POSIX +-AC_PROG_CC +-AC_PROG_INSTALL +-AC_PROG_MAKE_SET +-AC_C_CONST +-AC_PROG_LIBTOOL +-AC_PATH_PROG(GLIB_MKENUMS, [glib-mkenums]) +-AC_PATH_PROG(GLIB_GENMARSHAL, [glib-genmarshal]) +- +-AM_SANITY_CHECK +-AM_PROG_CC_STDC +- +-# Honor aclocal flags +-ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" +- + m4_define([glib_required], [2.12.0]) + m4_define([gtk_required], [2.11.0]) + m4_define([dbus_required], [0.70]) +@@ -122,7 +119,6 @@ AM_CONDITIONAL([HAVE_DBUS], [test "x$have_dbus" = "xyes"]) + dnl Bacon backend + dnl This is the fallback backend, so we *need* these headers and functions + dnl even if we end up using D-Bus +-dnl D-Bus backend dependencies + m4_define([have_bacon_default], [yes]) + AC_ARG_ENABLE([bacon], + [AC_HELP_STRING([--enable-bacon=@<:@yes/no@:>@], +@@ -178,9 +174,9 @@ AC_ARG_ENABLE([maintainer-flags], + AS_IF([test "x$enable_maintainer_flags" = "xyes" && test "x$GCC" = "xyes"], + [ + AS_COMPILER_FLAGS([MAINTAINER_CFLAGS], +- ["-Werror -Wall -Wshadow -Wcast-align +- -Wno-uninitialized -Wempty-body -Wformat-security +- -Winit-self"]) ++ ["-Wall -Wshadow -Wcast-align ++ -Wno-uninitialized -Wempty-body ++ -Wformat-security -Winit-self"]) + ] + ) + +@@ -230,27 +226,10 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], + AM_GLIB_DEFINE_LOCALEDIR(UNIQUE_LOCALEDIR) + + # introspection +-GOBJECT_INTROSPECTION_CHECK([0.6.3]) ++GOBJECT_INTROSPECTION_CHECK([0.6.7]) + + # gtk-doc +-GTK_DOC_CHECK([1.11]) +- +-# nice builds +-m4_ifdef([AM_SILENT_RULES], +- [ +- AM_SILENT_RULES([yes]) +- use_shave=no +- ], +- [ +- SHAVE_INIT([build/autotools], [enable]) +- AC_CONFIG_FILES([ +- build/autotools/shave-libtool +- build/autotools/shave +- ]) +- use_shave=yes +- ]) +- +-AM_CONDITIONAL([USE_SHAVE], [test "x$use_shave" = "xyes"]) ++GTK_DOC_CHECK([1.13]) + + AC_CONFIG_FILES([ + Makefile +-- +cgit v0.9.0.2 diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch new file mode 100644 index 0000000000..d75de93fc2 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/fix_for_compile_with_gcc-4.6.0.patch @@ -0,0 +1,36 @@ +Upstream-Status: Pending + +Fix Following compilation errors with gcc 4.6.0 + +Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/10 + +| uniquebackend-dbus.c: In function 'unique_backend_dbus_request_name': +| uniquebackend-dbus.c:87:22: error: variable 'backend_dbus' set but not used [-Werror=unused-but-set-variable] +| uniquebackend-dbus.c: In function 'unique_backend_dbus_send_message': +| uniquebackend-dbus.c:189:12: error: variable 'res' set but not used [-Werror=unused-but-set-variable] +| cc1: all warnings being treated as errors +| +| make[5]: *** [libunique_dbus_la-uniquebackend-dbus.lo] Error 1 + +Index: libunique-1.1.6/unique/dbus/uniquebackend-dbus.c +=================================================================== +--- libunique-1.1.6.orig/unique/dbus/uniquebackend-dbus.c ++++ libunique-1.1.6/unique/dbus/uniquebackend-dbus.c +@@ -84,7 +84,7 @@ unique_backend_dbus_register_proxy (Uniq + static gboolean + unique_backend_dbus_request_name (UniqueBackend *backend) + { +- UniqueBackendDBus *backend_dbus; ++ UniqueBackendDBus __attribute__((__unused__)) *backend_dbus; + const gchar *name; + DBusGConnection *connection; + DBusGProxy *proxy; +@@ -186,7 +186,7 @@ unique_backend_dbus_send_message (Unique + GValueArray *data; + gchar *cmd; + gchar *resp; +- gboolean res; ++ gboolean __attribute__((__unused__)) res; + GError *error; + UniqueResponse response; + diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch new file mode 100644 index 0000000000..2cc03473c5 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique/noconst.patch @@ -0,0 +1,130 @@ +G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid +build failures. + +RP 2011/10/12 + +Upstream-Status: Pending + +Index: libunique-1.1.6/unique/uniqueapp.c +=================================================================== +--- libunique-1.1.6.orig/unique/uniqueapp.c 2011-10-12 01:21:25.842046488 +0100 ++++ libunique-1.1.6/unique/uniqueapp.c 2011-10-12 01:21:55.062046796 +0100 +@@ -781,7 +781,7 @@ + } + + +-G_CONST_RETURN gchar * ++const gchar * + unique_command_to_string (UniqueApp *app, + gint command) + { +@@ -863,7 +863,7 @@ + return retval; + } + +-G_CONST_RETURN gchar * ++const gchar * + unique_response_to_string (UniqueResponse response) + { + GEnumClass *enum_class; +Index: libunique-1.1.6/unique/uniquebackend.c +=================================================================== +--- libunique-1.1.6.orig/unique/uniquebackend.c 2011-10-12 01:21:25.742046323 +0100 ++++ libunique-1.1.6/unique/uniquebackend.c 2011-10-12 01:21:55.062046796 +0100 +@@ -111,7 +111,7 @@ + * + * Return value: FIXME + */ +-G_CONST_RETURN gchar * ++const gchar * + unique_backend_get_name (UniqueBackend *backend) + { + g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); +@@ -154,7 +154,7 @@ + * + * Return value: FIXME + */ +-G_CONST_RETURN gchar * ++const gchar * + unique_backend_get_startup_id (UniqueBackend *backend) + { + g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL); +Index: libunique-1.1.6/unique/uniquebackend.h +=================================================================== +--- libunique-1.1.6.orig/unique/uniquebackend.h 2011-10-12 01:21:25.992046521 +0100 ++++ libunique-1.1.6/unique/uniquebackend.h 2011-10-12 01:21:56.512047875 +0100 +@@ -94,10 +94,10 @@ + + UniqueBackend * unique_backend_create (void); + +-G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend); ++const gchar *unique_backend_get_name (UniqueBackend *backend); + void unique_backend_set_name (UniqueBackend *backend, + const gchar *name); +-G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend); ++const gchar *unique_backend_get_startup_id (UniqueBackend *backend); + void unique_backend_set_startup_id (UniqueBackend *backend, + const gchar *startup_id); + GdkScreen * unique_backend_get_screen (UniqueBackend *backend); +Index: libunique-1.1.6/unique/uniqueinternals.h +=================================================================== +--- libunique-1.1.6.orig/unique/uniqueinternals.h 2011-10-12 01:21:25.892046532 +0100 ++++ libunique-1.1.6/unique/uniqueinternals.h 2011-10-12 01:21:56.512047875 +0100 +@@ -44,11 +44,11 @@ + * and then back into an id + */ + UniqueResponse unique_response_from_string (const gchar *response); +-G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response); ++const gchar *unique_response_to_string (UniqueResponse response); + + gint unique_command_from_string (UniqueApp *app, + const gchar *command); +-G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app, ++const gchar *unique_command_to_string (UniqueApp *app, + gint command); + + G_END_DECLS +Index: libunique-1.1.6/unique/uniquemessage.c +=================================================================== +--- libunique-1.1.6.orig/unique/uniquemessage.c 2011-10-12 01:21:25.942046524 +0100 ++++ libunique-1.1.6/unique/uniquemessage.c 2011-10-12 01:21:55.072046595 +0100 +@@ -185,7 +185,7 @@ + * + * Since: 1.0.2 + */ +-G_CONST_RETURN guchar * ++const guchar * + unique_message_data_get (UniqueMessageData *message_data, + gsize *length) + { +@@ -525,7 +525,7 @@ + * owned by the #UniqueMessageData structure and should not be + * modified or freed + */ +-G_CONST_RETURN gchar * ++const gchar * + unique_message_data_get_startup_id (UniqueMessageData *message_data) + { + g_return_val_if_fail (message_data != NULL, NULL); +Index: libunique-1.1.6/unique/uniquemessage.h +=================================================================== +--- libunique-1.1.6.orig/unique/uniquemessage.h 2011-10-12 01:21:25.792046596 +0100 ++++ libunique-1.1.6/unique/uniquemessage.h 2011-10-12 01:21:56.512047875 +0100 +@@ -48,7 +48,7 @@ + void unique_message_data_set (UniqueMessageData *message_data, + const guchar *data, + gsize length); +-G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data, ++const guchar *unique_message_data_get (UniqueMessageData *message_data, + gsize *length); + + gboolean unique_message_data_set_text (UniqueMessageData *message_data, +@@ -63,7 +63,7 @@ + gchar * unique_message_data_get_filename (UniqueMessageData *message_data); + + GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data); +-G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); ++const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data); + guint unique_message_data_get_workspace (UniqueMessageData *message_data); + + G_END_DECLS diff --git a/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb new file mode 100644 index 0000000000..49ed07ad97 --- /dev/null +++ b/meta-openembedded/meta-xfce/recipes-extended/libunique/libunique_1.1.6.bb @@ -0,0 +1,30 @@ +SUMMARY = "Library for supporting single instance GTK+ applications" +DESCRIPTION = "Unique is a library for writing single instance GTK+ applications. If you launch a single instance application twice, the second instance will either just quit or will send a message to the running instance." +HOMEPAGE = "https://wiki.gnome.org/Attic/LibUnique" +BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=libunique" + +SRC_URI = "${GNOME_MIRROR}/libunique/1.1/libunique-${PV}.tar.bz2 \ + file://fix_for_compile_with_gcc-4.6.0.patch \ + file://noconst.patch \ + file://build.patch \ + file://0001-Makefile.am-use-LIBTOOL-instead-of-hardcoded-libtool.patch \ + file://0001-test-unique-Add-format-qualifier-s-for-string.patch \ + " + +SRC_URI[md5sum] = "7955769ef31f1bc4f83446dbb3625e6d" +SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb" + +PR = "r7" + +DEPENDS = "dbus-glib-native glib-2.0 gtk+" + +PACKAGECONFIG ??= "dbus" +PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + + +inherit autotools pkgconfig gobject-introspection distro_features_check gtk-doc + +REQUIRED_DISTRO_FEATURES = "x11" |