By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Fix hard-coded path /opt/kde3, compile support for TDE and subsequent FTBFS

bp900.diff (text/plain), 5.23 KB, created by Slávek Banko on 2012-05-08 06:02:21 CDT

(hide)

Description: Fix hard-coded path /opt/kde3, compile support for TDE and subsequent FTBFS

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2012-05-08 06:02:21 CDT

Size: 5.23 KB

patch

obsolete

>diff -u a/acinclude.m4 b/acinclude.m4 >--- a/acinclude.m4 >+++ b/acinclude.m4 >@@ -2149,7 +2149,7 @@ > if test -n "$KDEDIR"; then > ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs" > fi >- ss_kde_general_test_path_suffix="kde kde3.0 kde3 KDE Kde KDE3 kde3 ." >+ ss_kde_general_test_path_suffix="trinity kde kde3.0 kde3 KDE Kde KDE3 kde3 ." > > AC_SS_FIND_FILE_PATH_EXT($SS_KDE_GENERAL_FILE_TO_SEARCH,$ss_kde_general_test_dirs,$ss_kde_general_test_path_suffix,SS_KDE_GENERAL_DIR) > >@@ -2513,9 +2513,14 @@ > SS_INCDIRS="$SS_INCDIRS -I$SS_KDE_INCDIR" > SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR" > SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR" >- SS_LIBLINK="-lkdecore -lkdeui -lkparts $SS_LIBLINK" >+ SS_LIBLINK="-lkdecore -lkdeui -lkparts -lDCOP -lkdefx -lkio $SS_LIBLINK" > AC_DEFINE([COMPILE_KDE_SUPPORT], 1, [define if you want to compile the KDE 3.x support]) >+ AC_DEFINE_UNQUOTED([KDE_DIR], "$SS_KDE_GENERAL_DIR", [contain path to KDE if compiled with the KDE 3.x support]) >+ AC_DEFINE_UNQUOTED([KDE_LIBDIR], "$SS_KDE_LIBDIR", [contain path to KDE libs if compiled with the KDE 3.x support]) > SS_BUILD_FLAGS="k$SS_BUILD_FLAGS" >+ else >+ AC_DEFINE_UNQUOTED([KDE_DIR], "", [contain path to KDE if compiled with the KDE 3.x support]) >+ AC_DEFINE_UNQUOTED([KDE_LIBDIR], "", [contain path to KDE libs if compiled with the KDE 3.x support]) > fi > > if test -n "$SS_OTHER_LIBLINK"; then >@@ -2524,7 +2529,7 @@ > > if test -n "$SS_OTHER_LIBDIRS"; then > SS_LIBDIRS="$SS_LIBDIRS $SS_OTHER_LIBDIRS" >- $SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g` >+ SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g` > SS_RPATH="$SS_RPATH -rpath $SS_OTHER_LIBDIRS" > fi > >diff -u a/admin/acinclude.m4.in b/admin/acinclude.m4.in >--- a/admin/acinclude.m4.in >+++ b/admin/acinclude.m4.in >@@ -2149,7 +2149,7 @@ > if test -n "$KDEDIR"; then > ss_kde_general_test_dirs="$KDEDIR $ss_kde_general_test_dirs" > fi >- ss_kde_general_test_path_suffix="kde kde3.0 kde3 KDE Kde KDE3 kde3 ." >+ ss_kde_general_test_path_suffix="trinity kde kde3.0 kde3 KDE Kde KDE3 kde3 ." > > AC_SS_FIND_FILE_PATH_EXT($SS_KDE_GENERAL_FILE_TO_SEARCH,$ss_kde_general_test_dirs,$ss_kde_general_test_path_suffix,SS_KDE_GENERAL_DIR) > >@@ -2513,9 +2513,14 @@ > SS_INCDIRS="$SS_INCDIRS -I$SS_KDE_INCDIR" > SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR" > SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR" >- SS_LIBLINK="-lkdecore -lkdeui -lkparts $SS_LIBLINK" >+ SS_LIBLINK="-lkdecore -lkdeui -lkparts -lDCOP -lkdefx -lkio $SS_LIBLINK" > AC_DEFINE([COMPILE_KDE_SUPPORT], 1, [define if you want to compile the KDE 3.x support]) >+ AC_DEFINE_UNQUOTED([KDE_DIR], "$SS_KDE_GENERAL_DIR", [contain path to KDE if compiled with the KDE 3.x support]) >+ AC_DEFINE_UNQUOTED([KDE_LIBDIR], "$SS_KDE_LIBDIR", [contain path to KDE libs if compiled with the KDE 3.x support]) > SS_BUILD_FLAGS="k$SS_BUILD_FLAGS" >+ else >+ AC_DEFINE_UNQUOTED([KDE_DIR], "", [contain path to KDE if compiled with the KDE 3.x support]) >+ AC_DEFINE_UNQUOTED([KDE_LIBDIR], "", [contain path to KDE libs if compiled with the KDE 3.x support]) > fi > > if test -n "$SS_OTHER_LIBLINK"; then >@@ -2524,7 +2529,7 @@ > > if test -n "$SS_OTHER_LIBDIRS"; then > SS_LIBDIRS="$SS_LIBDIRS $SS_OTHER_LIBDIRS" >- $SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g` >+ SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g` > SS_RPATH="$SS_RPATH -rpath $SS_OTHER_LIBDIRS" > fi > >diff -u a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp >--- a/src/kvirc/kernel/kvi_app_fs.cpp >+++ b/src/kvirc/kernel/kvi_app_fs.cpp >@@ -55,7 +55,7 @@ > > // Local hack for Debian > case Modules : >- case Plugins : szData = "/opt/kde3/lib/kvirc/" KVI_VERSION_BRANCH "/modules"; break; >+ case Plugins : szData = KDE_LIBDIR "/kvirc/" KVI_VERSION_BRANCH "/modules"; break; > > case EasyPlugins : szData.append("easyplugins"); break; > case ConfigPlugins : KviTQString::appendFormatted(szData,"config%smodules",KVI_PATH_SEPARATOR); break; >diff -u a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp >--- a/src/kvirc/kernel/kvi_app_setup.cpp >+++ b/src/kvirc/kernel/kvi_app_setup.cpp >@@ -500,6 +500,7 @@ > #ifndef COMPILE_ON_WINDOWS > const char * usualKvircGlobalPrePath[]= > { >+ KDE_DIR, > "/usr/local", "/opt/kde", "/usr", > "/usr/local/lib", "/opt/kde3", "/usr/lib", > "/usr/local/kde", "/opt", "/usr/etc", >diff -u a/src/modules/mediaplayer/Makefile.am b/src/modules/mediaplayer/Makefile.am >--- a/src/modules/mediaplayer/Makefile.am >+++ b/src/modules/mediaplayer/Makefile.am >@@ -10,7 +10,7 @@ > #%.moc: %.h > # $(SS_QT_MOC) $< -o $@ > >-libkvimediaplayer_la_LDFLAGS = -avoid-version -module >+libkvimediaplayer_la_LDFLAGS = -avoid-version -module $(SS_LDFLAGS) $(SS_LIBDIRS) > > libkvimediaplayer_la_SOURCES = libkvimediaplayer.cpp \ > mp_amarokinterface.cpp \ >diff -u a/src/modules/torrent/Makefile.am b/src/modules/torrent/Makefile.am >--- a/src/modules/torrent/Makefile.am >+++ b/src/modules/torrent/Makefile.am >@@ -10,7 +10,7 @@ > #%.moc: %.h > # $(SS_QT_MOC) $< -o $@ > >-libkvitorrent_la_LDFLAGS = -avoid-version -module >+libkvitorrent_la_LDFLAGS = -avoid-version -module $(SS_LDFLAGS) $(SS_LIBDIRS) > > libkvitorrent_la_SOURCES = libkvitorrent.cpp \ > tc_interface.cpp \ View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]