diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-08-09 12:02:10 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-08-09 12:02:10 +0200 |
| commit | 193ac9dc51fbc8d12aa48fe1191c8512850cc4ff (patch) | |
| tree | 9eeda8ad34f229e1033e856ed93c17fea30f68e1 /redhat/applications/kmymoney/kmymoney-3.5.13-fix_qt3_plugins_location.patch | |
| parent | 37e6c5ace1de8d59324c01aacd06aabad16747e2 (diff) | |
| download | tde-packaging-193ac9dc51fbc8d12aa48fe1191c8512850cc4ff.tar.gz tde-packaging-193ac9dc51fbc8d12aa48fe1191c8512850cc4ff.zip | |
RHEL/Fedora: add support for MGA2/MDV2011 in many applications
Diffstat (limited to 'redhat/applications/kmymoney/kmymoney-3.5.13-fix_qt3_plugins_location.patch')
| -rw-r--r-- | redhat/applications/kmymoney/kmymoney-3.5.13-fix_qt3_plugins_location.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/redhat/applications/kmymoney/kmymoney-3.5.13-fix_qt3_plugins_location.patch b/redhat/applications/kmymoney/kmymoney-3.5.13-fix_qt3_plugins_location.patch new file mode 100644 index 000000000..8a6754fb5 --- /dev/null +++ b/redhat/applications/kmymoney/kmymoney-3.5.13-fix_qt3_plugins_location.patch @@ -0,0 +1,41 @@ +--- kmymoney/kmymoney2/widgets/Makefile.am.ORI 2012-08-05 18:38:59.001977368 +0200 ++++ kmymoney/kmymoney2/widgets/Makefile.am 2012-08-05 18:39:47.007986865 +0200 +@@ -68,19 +68,19 @@ + # Hence the quick hack to include the required objects from the + # libkmm_mymoney.so directly into libkmymoney.so + libkmymoney_la_CXXFLAGS = -U_CHECK_MEMORY -DKMM_DESIGNER +-libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)$(qt_libraries)/../plugins/designer $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) ++libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)${QTPLUGINS}/designer $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) + + if INSTALL_QTDESIGNER_SUPPORT + install-exec-local: libkmymoney.la +- $(mkinstalldirs) $(DESTDIR)$(qt_libraries)/../plugins/designer +- $(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)$(qt_libraries)/../plugins/designer ++ $(mkinstalldirs) $(DESTDIR)${QTPLUGINS}/designer ++ $(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)${QTPLUGINS}/designer + $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/$(PICS_DIR) + for file in $(WIDGET_PNGS); do \ + $(INSTALL_DATA) $(abs_srcdir)/$$file $(DESTDIR)$(kde_datadir)/$(PICS_DIR); \ + done + + uninstall-local: +- -rm $(DESTDIR)$(qt_libraries)/../plugins/designer/libkmymoney.so ++ -rm $(DESTDIR)${QTPLUGINS}/designer/libkmymoney.so + for file in $(WIDGET_PNGS); do \ + rm -rf $(DESTDIR)$(kde_datadir)/$(PICS_DIR)/$$file; \ + done +--- kmymoney/admin/acinclude.m4.ORI 2012-08-05 19:47:47.819789267 +0200 ++++ kmymoney/admin/acinclude.m4.in 2012-08-05 19:48:35.842776216 +0200 +@@ -6724,7 +6724,11 @@ + QTDIR=`dirname $MOC` + QTDIR=${QTDIR%/bin} + fi +- LIBSQLITE3=${QTDIR}/plugins/sqldrivers/libsqlite3${qtlib}.so ++ if test x$QTPLUGINS = x; then ++ LIBSQLITE3=${QTDIR}/plugins/sqldrivers/libsqlite3${qtlib}.so ++ else ++ LIBSQLITE3=${QTPLUGINS}/sqldrivers/libsqlite3${qtlib}.so ++ fi + + # do the checks + if test $enable_sqlite3 = auto; then |