[oe-commits] org.oe.dev miniclipboard: Fix Makefile issues.

[florian commit]

miniclipboard: Fix Makefile issues.

Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 2fb07c3a5f9f45fb0c5916e0286ca12b746cae33
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2fb07c3a5f9f45fb0c5916e0286ca12b746cae33
Files:
1
packages/miniclipboard/miniclipboard-0.3/makefile.patch
packages/miniclipboard/miniclipboard_0.3.bb
Diffs:

#
# mt diff -r2b9fd7116be75e3d94279f28cb67944b9f96a04f -r2fb07c3a5f9f45fb0c5916e0286ca12b746cae33
#
# 
# 
# add_file "packages/miniclipboard/miniclipboard-0.3/makefile.patch"
#  content [613e186c39f2380f1ac68f982a76173678593813]
# 
# patch "packages/miniclipboard/miniclipboard_0.3.bb"
#  from [e39bff53b8278bcb1c3d67adb46879e3ef18eb60]
#    to [f778bceed640577c83c144bee3fa6433b0b9a1dd]
# 
============================================================
--- packages/miniclipboard/miniclipboard-0.3/makefile.patch	613e186c39f2380f1ac68f982a76173678593813
+++ packages/miniclipboard/miniclipboard-0.3/makefile.patch	613e186c39f2380f1ac68f982a76173678593813
@@ -0,0 +1,26 @@
+Index: Makefile
+===================================================================
+--- Makefile	(Revision 9102)
++++ Makefile	(Arbeitskopie)
+@@ -6,16 +6,16 @@
+ 
+ MEMBERS = miniclipboard mbpixbuf mbtray
+ 
+-CFLAGS += -Wall
++PACKAGE_CFLAGS += -Wall `pkg-config --cflags x11`
+ ifeq ($(DEBUG),yes)
+-CFLAGS += -O2 -g
+-LDFLAGS = -g #-lefence
++PACKAGE_CFLAGS += -O2 -g
++LDFLAGS = -g 
+ else
+-CFLAGS += -Os -fomit-frame-pointer
++PACKAGE_CFLAGS += -Os -fomit-frame-pointer
+ endif
+ CPPFLAGS += -DPACKAGE=\"$(PACKAGE)\" -DPREFIX=\"$(PREFIX)\" -DPACKAGE_LOCALE_DIR=\"$(PREFIX)/share/locale\"
+ 
+-PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) -L/usr/X11R6/lib -lX11 -lXpm -lXext
++PACKAGE_LDFLAGS += $(STANDARD_LDFLAGS) $(`pkg-config --libs x11`) -lXpm -lXext
+ 
+ OBJS = $(patsubst %,%.o,$(MEMBERS))
+ 
============================================================
--- packages/miniclipboard/miniclipboard_0.3.bb	e39bff53b8278bcb1c3d67adb46879e3ef18eb60
+++ packages/miniclipboard/miniclipboard_0.3.bb	f778bceed640577c83c144bee3fa6433b0b9a1dd
@@ -1,12 +1,13 @@ inherit gpe
 SECTION = "x11/utils"
 inherit gpe
-LICENSE = "LGPL"
+LICENSE = "GPL"
 DESCRIPTION = "Clipboard management application"
 DEPENDS = "virtual/libx11"
 RDEPENDS = "gdk-pixbuf-loader-xpm"
-PR = "r1"
+PR = "r2"
 
-SRC_URI += "file://miniclipboard.desktop"
+SRC_URI += "file://miniclipboard.desktop \
+            file://makefile.patch;patch=1;pnum=0"
 
 do_install() {
 	install -d ${D}${bindir}