aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/albumshaper/files/fixpaths.patch
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/albumshaper/files/fixpaths.patch
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
downloadopenembedded-709c4d66e0b107ca606941b988bad717c0b45d9b.tar.gz
openembedded-709c4d66e0b107ca606941b988bad717c0b45d9b.tar.bz2
openembedded-709c4d66e0b107ca606941b988bad717c0b45d9b.zip
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/albumshaper/files/fixpaths.patch')
-rw-r--r--recipes/albumshaper/files/fixpaths.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/recipes/albumshaper/files/fixpaths.patch b/recipes/albumshaper/files/fixpaths.patch
new file mode 100644
index 0000000000..34ca2e3804
--- /dev/null
+++ b/recipes/albumshaper/files/fixpaths.patch
@@ -0,0 +1,53 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- albumshaper_2.1_src/Makefile~fixpaths
++++ albumshaper_2.1_src/Makefile
+@@ -1,6 +1,6 @@
+ #############################################################################
+ # Makefile for building: bin/AlbumShaper.bin
+-# Generated by qmake (1.07a) (Qt 3.3.5) on: Tue May 9 12:09:27 2006
++# Generated by qmake (1.07a) (Qt 3.3.5) on: Tue May 9 13:58:45 2006
+ # Project: AlbumShaper.pro
+ # Template: app
+ # Command: $(QMAKE) -spec /local/pkg/oe/c7x0/tmp/staging/i686-linux/share/qmake/linux-oe-g++ -after "CONFIG+=thread" -o Makefile AlbumShaper.pro
+@@ -12,14 +12,14 @@
+ CXX = $(OE_QMAKE_CXX)
+ LEX = flex
+ YACC = yacc
+-CFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/usr/include/libxml2 -I/usr/include/libxml2 -Os -D_REENTRANT -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
+-CXXFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/usr/include/libxml2 -I/usr/include/libxml2 -Os -D_REENTRANT -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
++CFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -Os -D_REENTRANT -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
++CXXFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) -Wall -W $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include -I/local/pkg/oe/c7x0/tmp/staging/arm-linux/include/libxml2 -Os -D_REENTRANT -DBIN_DIR=\"/usr/bin\" -DDATA_DIR=\"/usr/share/albumshaper\" -DQT_NO_DEBUG -DQT_THREAD_SUPPORT
+ LEXFLAGS =
+ YACCFLAGS= -d
+ INCPATH = -I/local/pkg/oe/c7x0/tmp/staging/i686-linux/share/qmake/linux-oe-g++ -I. -I$(OE_QMAKE_INCDIR_QT) -Itmp/
+ LINK = $(OE_QMAKE_LINK)
+ LFLAGS = $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA) -s -Wl,-rpath-link,$(OE_QMAKE_LIBDIR_QT)
+-LIBS = $(SUBLIBS) -L$(OE_QMAKE_LIBDIR_QT) $(LIBS_EXTRA) -ljpeg -L/usr/lib -lxslt -lxml2 -lz -lm -lxml2 -lz -lm -lxslt -lxml2 -ljpeg -l$(OE_QMAKE_LIBS_QT)-mt $(OE_QMAKE_LIBS_X11) -lpthread
++LIBS = $(SUBLIBS) -L$(OE_QMAKE_LIBDIR_QT) $(LIBS_EXTRA) -ljpeg -L/local/pkg/oe/c7x0/tmp/staging/arm-linux/lib -lxslt -lxml2 -lz -lm -L/local/pkg/oe/c7x0/tmp/staging/arm-linux/lib -lxml2 -lz -lm -lxslt -lxml2 -ljpeg -l$(OE_QMAKE_LIBS_QT)-mt $(OE_QMAKE_LIBS_X11) -lpthread
+ AR = $(OE_QMAKE_AR) cqs
+ RANLIB =
+ MOC = $(OE_QMAKE_MOC)
+@@ -1377,7 +1377,7 @@
+
+ install_scripts: all
+ @$(CHK_DIR_EXISTS) "$(INSTALL_ROOT)/usr/bin/" || $(MKDIR) "$(INSTALL_ROOT)/usr/bin/"
+- cp -f bin/AlbumShaper /usr/bin/AlbumShaper;
++ cp -f bin/AlbumShaper $(INSTALL_ROOT)//usr/bin/AlbumShaper;
+
+
+ install: install_target install_images install_text install_themes install_translations install_xmlConversion install_scripts
+--- albumshaper_2.1_src/AlbumShaper.pro~fixpaths
++++ albumshaper_2.1_src/AlbumShaper.pro
+@@ -272,7 +272,7 @@
+
+ #--------- Launcher Script (Linux/FreeBSD) ------------
+ !mac:unix:scripts.path = $${BIN_DIR}
+-!mac:unix:scripts.commands = cp -f bin/AlbumShaper $${BIN_DIR}/AlbumShaper;
++!mac:unix:scripts.commands = cp -f bin/AlbumShaper $(INSTALL_ROOT)/$${BIN_DIR}/AlbumShaper;
+
+
+ #===========================================================================================