diff options
Diffstat (limited to 'extra/gcin/qt4-lib64.patch')
| -rw-r--r-- | extra/gcin/qt4-lib64.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/extra/gcin/qt4-lib64.patch b/extra/gcin/qt4-lib64.patch index abc15950e..c47248beb 100644 --- a/extra/gcin/qt4-lib64.patch +++ b/extra/gcin/qt4-lib64.patch @@ -1,6 +1,6 @@ diff -aur old/configure new/configure ---- old/configure 2011-11-07 06:51:12.000000000 +1100 -+++ new/configure 2011-11-25 14:02:10.819256960 +1100 +--- old/configure 2011-12-21 00:48:03.000000000 +1100 ++++ new/configure 2011-12-25 04:06:14.424317251 +1100 @@ -188,7 +188,7 @@ @@ -10,9 +10,18 @@ diff -aur old/configure new/configure echo "testing if you have qt4 support" pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null if [ $? = 0 ]; then +@@ -245,7 +245,7 @@ + mv gcin.spec gcin.spec.tmp + grep -v qt4/plugins/inputmethods gcin.spec.tmp > gcin.spec + else +- for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc ++ for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc /usr/bin/moc + do + [ -x $i ] && QT4_MOC=$i + done diff -aur old/qt4-im/Makefile new/qt4-im/Makefile ---- old/qt4-im/Makefile 2011-06-08 23:03:50.000000000 +1000 -+++ new/qt4-im/Makefile 2011-11-25 14:05:28.844110772 +1100 +--- old/qt4-im/Makefile 2011-12-19 14:52:46.000000000 +1100 ++++ new/qt4-im/Makefile 2011-12-25 04:06:14.424317251 +1100 @@ -1,5 +1,5 @@ include ../config.mak -QT=qt4 @@ -20,12 +29,3 @@ diff -aur old/qt4-im/Makefile new/qt4-im/Makefile QTIM=$(QT)/plugins/inputmethods IMMODULES=$(libdir)/$(QTIM) -@@ -15,7 +15,7 @@ - $(CXX) -E $(CFLAGS) $(INCS) $< > $@ - - moc_gcin-qt.cpp: gcin-qt.h -- /usr/$(LIB)/$(QT)/bin/moc $< -o moc_gcin-qt.cpp -+ /usr/bin/moc $< -o moc_gcin-qt.cpp - - im-gcin.so: $(OBJS) - export LD_RUN_PATH=$(gcinlibdir) ;\ |