[oe-commits] org.oe.dev notecase: unify recipes

[hrw commit]

notecase: unify recipes

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 22f47091551c440833cf1a14222863adf67bb2b4
ViewMTN: http://monotone.openembedded.org/revision/info/22f47091551c440833cf1a14222863adf67bb2b4
Files:
1
packages/notecase/1
packages/notecase/notecase.inc
packages/notecase/notecase-1.6.9/no-hardcoded-cxx.patch
packages/notecase/notecase_1.2.6.bb
packages/notecase/notecase_1.6.9.bb
Diffs:

#
# mt diff -r74f70c34b6e63e9a14df84567e04b10f995dd602 -r22f47091551c440833cf1a14222863adf67bb2b4
#
# 
# 
# delete "packages/notecase/1"
# 
# add_file "packages/notecase/notecase.inc"
#  content [668f1737dd66663c50c9d3d3e3166c184e45f0b0]
# 
# patch "packages/notecase/notecase-1.6.9/no-hardcoded-cxx.patch"
#  from [458548afd36c5671db30be8515cdbacaf90afe66]
#    to [51ab9f2f39f13a1affed9594ed4bf1b08d5924ed]
# 
# patch "packages/notecase/notecase_1.2.6.bb"
#  from [1fd0ae48a08312344f8542bab69d04c5d1d73db7]
#    to [e78e8e5069260de760671e0644ef1592bdb07f2e]
# 
# patch "packages/notecase/notecase_1.6.9.bb"
#  from [d3beaa2a4e039c882b80573bc5cd7a42771bdc7c]
#    to [aeb0a547c5d487b7af7569f01b002beffd26546d]
# 
============================================================
--- packages/notecase/notecase.inc	668f1737dd66663c50c9d3d3e3166c184e45f0b0
+++ packages/notecase/notecase.inc	668f1737dd66663c50c9d3d3e3166c184e45f0b0
@@ -0,0 +1,13 @@
+DESCRIPTION = "Hierarchical note manager (aka. outliner)"
+AUTHOR = "Miroslav Rajcic <miroslav.rajcic at inet.hr>"
+HOMEPAGE = "http://notecase.sourceforge.net/"
+SECTION = "x11/utils"
+LICENSE = "BSD"
+DEPENDS = "zlib gtk+ gnome-vfs"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}_src.tar.gz \
+           file://no-hardcoded-cxx.patch;patch=1"
+
+do_compile_prepend() {
+        cp ${STAGING_LIBDIR}/libz.a ${S}/src/lib/zlib/
+}
============================================================
--- packages/notecase/notecase-1.6.9/no-hardcoded-cxx.patch	458548afd36c5671db30be8515cdbacaf90afe66
+++ packages/notecase/notecase-1.6.9/no-hardcoded-cxx.patch	51ab9f2f39f13a1affed9594ed4bf1b08d5924ed
@@ -36,41 +36,3 @@
  
  $(OBJ)/ShortcutsList.o: $(GUIPATH)/ShortcutsList.cpp $(GUIPATH)/ShortcutsList.h
  	$(CC) $(FLAGS) -c $(GUIPATH)/ShortcutsList.cpp -o $(OBJ)/ShortcutsList.o  $(GTKCFLAGS)
---- tmp/Makefile	2007-05-08 12:25:10.000000000 +0200
-+++ Makefile	2007-11-03 10:46:51.000000000 +0100
-@@ -131,7 +131,7 @@
- ifdef WINDIR
-  LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -L$(OBJ) -lz 
- else
-- LD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LDFLAGS) -ldl
-+ NLD=$(QL) $(CXX) $(DEBUG) $(PROFILE) $(LOPTIMIZE) -ldl -export-dynamic $(LOPTIMIZE)
- endif 
- 
- #
-@@ -190,7 +190,7 @@
-  LIBS += hildon-libs hildon-fm libosso
- endif
- 
--GTKCFLAGS=`pkg-config --cflags $(LIBS)` -I/target/include  -I/sw/include 
-+GTKCFLAGS=`pkg-config --cflags $(LIBS)` 
- GTKLIBS=`pkg-config --libs $(LIBS)`
- 
- #
-@@ -201,7 +201,7 @@
- 	$(LD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS)
- else
- notecase$(EXE): updatesrc $(OBJS)
--	$(LD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS) > /dev/null
-+	$(NLD) $(OBJS) -o $(BIN)/notecase$(EXE) $(FLAGS) $(LDFLAGS) $(GTKLIBS)
- endif	
- 
- #
-@@ -421,7 +421,7 @@
- 	$(CC) $(FLAGS) -c $(GUIPATH)/DocActionFinishDel.cpp -o $(OBJ)/DocActionFinishDel.o $(GTKCFLAGS)
- 	
- $(OBJ)/libz.a:
--	@cd ./src/lib/zlib/; $(MAKE); cp ./libz.a ../../../$(OBJ)/
-+	@cd ./src/lib/zlib/; cp ./libz.a ../../../$(OBJ)/
- 
- $(OBJ)/ShortcutsList.o: $(GUIPATH)/ShortcutsList.cpp $(GUIPATH)/ShortcutsList.h
- 	$(CC) $(FLAGS) -c $(GUIPATH)/ShortcutsList.cpp -o $(OBJ)/ShortcutsList.o  $(GTKCFLAGS)
============================================================
--- packages/notecase/notecase_1.2.6.bb	1fd0ae48a08312344f8542bab69d04c5d1d73db7
+++ packages/notecase/notecase_1.2.6.bb	e78e8e5069260de760671e0644ef1592bdb07f2e
@@ -1,21 +1,5 @@
-DESCRIPTION = "NoteCase is a hierarchical note manager (aka. outliner)." "
-AUTHOR = "Miroslav Rajcic"
-HOMEPAGE = "notecase.sf.net"
-SECTION = "x11/utils"
-LICENSE = "BSD"
+require notecase.inc
 
-DEPENDS = "zlib gtk+ gnome-vfs"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}_src.tar.gz \
-	   file://no-hardcoded-cxx.patch;patch=1"
-
-inherit pkgconfig
-
-do_compile_prepend() {
-	cp ${STAGING_LIBDIR}/libz.a ${S}/src/lib/zlib/
-}
-
-
 do_install() {
 	install -d ${D}${bindir}
 	install -d ${D}${datadir}/applications
============================================================
--- packages/notecase/notecase_1.6.9.bb	d3beaa2a4e039c882b80573bc5cd7a42771bdc7c
+++ packages/notecase/notecase_1.6.9.bb	aeb0a547c5d487b7af7569f01b002beffd26546d
@@ -1,21 +1,7 @@
-DESCRIPTION = "NoteCase is a hierarchical note manager (aka. outliner)." "
-AUTHOR = "Mioslav Rajcic"
-HOMEPAGE = "notecase.sf.net"
-SECTION = "x11/utils"
-LICENSE = "BSD"
+require notecase.inc
 
-DEPENDS = "zlib gtk+ gnome-vfs"
+PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${P}_src.tar.gz\
-	  file://no-hardcoded-cxx.patch;patch=1"
-
-inherit pkgconfig
-
-do_compile_prepend() {
-	cp ${STAGING_LIBDIR}/libz.a ${S}/src/lib/zlib/
-}
-
-
 do_install() {
 	install -d ${D}${bindir}
 	install -d ${D}${datadir}/applications
@@ -27,3 +13,5 @@ do_install() {
         install -m 644 ${S}/res/notecase.xpm ${D}${datadir}/icons/notecase.xpm
 	install -m 755 ${S}/bin/notecase ${D}${bindir}/
 }
+
+FILES_${PN} += "${datadir}"