[patch] klear-0.5.1-qt.patch

klear-0.5.1-qt.patch (text/plain), 3.77 KB, created by gentoolinux on 2005-10-26 12:10:36 UTC

--- klear-0.5.1/src/src.pro	2005-10-24 13:39:07.000000000 +0200
+++ klear-0.5.1-patched/src/src.pro	2005-10-26 18:56:14.000000000 +0200
@@ -142,6 +142,7 @@
 QMAKE_LIBDIR = /usr/kde/3.4/lib \
 /usr/lib/qt3 \
 /usr/lib/qt \
+/usr/qt/3/lib \
 /usr/share/qt/3/lib \
 /usr/share/qt3/lib \
 /usr/share/qt/lib \


--- klear-0.5.1/Makefile	2005-10-23 19:25:18.000000000 +0200
+++ klear-0.5.1-patched/Makefile	2005-10-26 20:44:55.000000000 +0200
@@ -47,7 +47,7 @@
 sub-media: media/$(MAKEFILE) FORCE
 	cd media && $(MAKE) -f $(MAKEFILE)
 
-Makefile: klear.pro  /usr/share/qt3/mkspecs/default/qmake.conf 
+Makefile: klear.pro  /usr/qt/3/mkspecs/linux-g++/qmake.conf 
 	$(QMAKE) -o Makefile klear.pro
 qmake: qmake_all
 	@$(QMAKE) -o Makefile klear.pro


--- klear-0.5.1/distfiles/Makefile	2005-10-26 14:01:34.000000000 +0200
+++ klear-0.5.1-patched/distfiles/Makefile	2005-10-26 18:15:36.000000000 +0200
@@ -19,7 +19,7 @@
 
 all: Makefile $(SUBTARGETS)
 
-Makefile: distfiles.pro  /usr/share/qt3/mkspecs/default/qmake.conf 
+Makefile: distfiles.pro  /usr/qt/3/mkspecs/linux-g++/qmake.conf 
 	$(QMAKE) -o Makefile distfiles.pro
 qmake: qmake_all
 	@$(QMAKE) -o Makefile distfiles.pro


--- klear-0.5.1/src/Makefile	2005-10-26 14:01:36.000000000 +0200
+++ klear-0.5.1-patched/src/Makefile	2005-10-26 20:43:30.000000000 +0200
@@ -19,11 +19,11 @@
 INCPATH  = -I/usr/share/qt3/mkspecs/default -I. -I../src -I/usr/kde/3.4/include -I/usr/include/qt -I/usr/qt/3/include -I/usr/include/qt3 -I/usr/share/qt3 -I/usr/qt/3/include -I/usr/kde/3.3/include -I/opt/kde3/include -I/opt/kde/include -I/usr/include/qt3 -I/usr/include/kde -I/usr/include/qt3 -I/usr/X11R6/include -IGUI/View/ -IGUI/View -Imoc/
 LINK     = g++
 LFLAGS   = 
-LIBS     = $(SUBLIBS) -L/usr/kde/3.4/lib -L/usr/lib/qt3 -L/usr/lib/qt -L/usr/share/qt/3/lib -L/usr/share/qt3/lib -L/usr/share/qt/lib -L/usr/share/kde3/lib -L/usr/share/kde/lib -L/opt/qt3/lib -L/opt/qt/lib -L/opt/kde3/lib -L/opt/kde/lib -L/usr/X11R6/lib/ -L/usr/local/lib/ -L/usr/lib -L/usr/share/qt3/lib -L/usr/X11R6/lib -lkio -lxine -lkdeui -lqt-mt -lXext -lX11 -lm -lpthread
+LIBS     = $(SUBLIBS) -L/usr/kde/3.4/lib -L/usr/lib/qt3 -L/usr/qt/3/lib -L/usr/lib/qt -L/usr/share/qt/3/lib -L/usr/share/qt3/lib -L/usr/share/qt/lib -L/usr/share/kde3/lib -L/usr/share/kde/lib -L/opt/qt3/lib -L/opt/qt/lib -L/opt/kde3/lib -L/opt/kde/lib -L/usr/X11R6/lib/ -L/usr/local/lib/ -L/usr/lib -L/usr/share/qt3/lib -L/usr/X11R6/lib -lkio -lxine -lkdeui -lqt-mt -lXext -lX11 -lm -lpthread
 AR       = ar cqs
 RANLIB   = 
-MOC      = /usr/share/qt3/bin/moc
-UIC      = /usr/share/qt3/bin/uic
+MOC      = $(QTDIR)/bin/moc
+UIC      = $(QTDIR)/bin/uic
 QMAKE    = qmake
 TAR      = tar -cf
 GZIP     = gzip -9f
@@ -258,7 +258,7 @@
 $(MOC): 
 	( cd $(QTDIR)/src/moc && $(MAKE) )
 
-Makefile: src.pro  /usr/share/qt3/mkspecs/default/qmake.conf /usr/share/qt3/lib/libqt-mt.prl
+Makefile: src.pro  /usr/qt/3/mkspecs/linux-g++/qmake.conf /usr/qt/3/lib/libqt-mt.prl
 	$(QMAKE) -o Makefile src.pro
 qmake: 
 	@$(QMAKE) -o Makefile src.pro


--- klear-0.5.1/templates/Makefile	2005-10-26 14:01:36.000000000 +0200
+++ klear-0.5.1-patched/templates/Makefile	2005-10-26 20:04:57.000000000 +0200
@@ -19,7 +19,7 @@
 
 all: Makefile $(SUBTARGETS)
 
-Makefile: templates.pro  /usr/share/qt3/mkspecs/default/qmake.conf 
+Makefile: templates.pro  /usr/qt/3/mkspecs/linux-g++/qmake.conf 
 	$(QMAKE) -o Makefile templates.pro
 qmake: qmake_all
 	@$(QMAKE) -o Makefile templates.pro


--- klear-0.5.1/media/Makefile	2005-10-26 14:01:36.000000000 +0200
+++ klear-0.5.1-patched/media/Makefile	2005-10-26 20:49:16.000000000 +0200
@@ -19,7 +19,7 @@
 
 all: Makefile $(SUBTARGETS)
 
-Makefile: media.pro  /usr/share/qt3/mkspecs/default/qmake.conf 
+Makefile: media.pro  /usr/qt/3/mkspecs/linux-g++/qmake.conf 
 	$(QMAKE) -o Makefile media.pro
 qmake: qmake_all
 	@$(QMAKE) -o Makefile media.pro