From c99aeb33ad2decad175b8ec0217f5ce70ab8ff7e Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 17 Jul 2012 22:43:11 +0000 Subject: gnome-panel3: move as-needed.patch to gnome-panel dir * there is BPN changed to gnome-panel and SRC_URI checksuming code cannot find it, causing this warning: WARNING: Unable to get checksum for gnome-panel3-native SRC_URI entry as-needed.patch: file could not be found Signed-off-by: Martin Jansa Signed-off-by: Koen Kooi --- .../gnome-panel/gnome-panel/as-needed.patch | 36 ++++++++++++++++++++++ .../gnome-panel/gnome-panel3/as-needed.patch | 36 ---------------------- .../gnome-panel/gnome-panel3_3.0.2.bb | 1 + 3 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 meta-gnome/recipes-gnome/gnome-panel/gnome-panel/as-needed.patch delete mode 100644 meta-gnome/recipes-gnome/gnome-panel/gnome-panel3/as-needed.patch (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/as-needed.patch b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/as-needed.patch new file mode 100644 index 0000000000..378e3e405a --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/as-needed.patch @@ -0,0 +1,36 @@ +From c65f1ae3472cfd4cd96fd376b7bbd95fba5eef0a Mon Sep 17 00:00:00 2001 +From: Vincent Untz +Date: Fri, 27 May 2011 17:00:14 +0000 +Subject: build: Fix build with --as-needed + +upstream-status: backport + +--- +diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am +index 0afc6c5..9734536 100644 +--- a/applets/notification_area/Makefile.am ++++ b/applets/notification_area/Makefile.am +@@ -29,17 +29,17 @@ libtray_la_SOURCES = \ + NOTIFICATION_AREA_SOURCES = main.c main.h + + NOTIFICATION_AREA_LDADD = \ ++ libtray.la \ + ../../libpanel-applet/libpanel-applet-4.la \ + $(X_LIBS) \ + $(NOTIFICATION_AREA_LIBS) \ +- $(LIBPANEL_APPLET_LIBS) \ +- libtray.la ++ $(LIBPANEL_APPLET_LIBS) + + testtray_SOURCES = testtray.c + testtray_LDADD = \ ++ libtray.la \ + $(X_LIBS) \ +- $(NOTIFICATION_AREA_LIBS) \ +- libtray.la ++ $(NOTIFICATION_AREA_LIBS) + + if NOTIFICATION_AREA_INPROCESS + APPLET_IN_PROCESS = true +-- +cgit v0.9 diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3/as-needed.patch b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3/as-needed.patch deleted file mode 100644 index 378e3e405a..0000000000 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3/as-needed.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c65f1ae3472cfd4cd96fd376b7bbd95fba5eef0a Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Fri, 27 May 2011 17:00:14 +0000 -Subject: build: Fix build with --as-needed - -upstream-status: backport - ---- -diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am -index 0afc6c5..9734536 100644 ---- a/applets/notification_area/Makefile.am -+++ b/applets/notification_area/Makefile.am -@@ -29,17 +29,17 @@ libtray_la_SOURCES = \ - NOTIFICATION_AREA_SOURCES = main.c main.h - - NOTIFICATION_AREA_LDADD = \ -+ libtray.la \ - ../../libpanel-applet/libpanel-applet-4.la \ - $(X_LIBS) \ - $(NOTIFICATION_AREA_LIBS) \ -- $(LIBPANEL_APPLET_LIBS) \ -- libtray.la -+ $(LIBPANEL_APPLET_LIBS) - - testtray_SOURCES = testtray.c - testtray_LDADD = \ -+ libtray.la \ - $(X_LIBS) \ -- $(NOTIFICATION_AREA_LIBS) \ -- libtray.la -+ $(NOTIFICATION_AREA_LIBS) - - if NOTIFICATION_AREA_INPROCESS - APPLET_IN_PROCESS = true --- -cgit v0.9 diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb index 37288e1821..c7be8d04ac 100644 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb +++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb @@ -2,6 +2,7 @@ DESCRIPTION = "GNOME panel" LICENSE = "GPLv2 & LGPLv2 & GFDLv1.1" BPN = "gnome-panel" +PR = "r1" DEFAULT_PREFERENCE = "-1" -- cgit 1.2.3-korg