rev 8554 - in branches/qt4-x11/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Wed Dec 26 20:37:00 UTC 2007 

Author: fabo
Date: 2007-12-26 20:37:00 +0000 (Wed, 26 Dec 2007)
New Revision: 8554

Removed:
   branches/qt4-x11/debian/patches/21_assume_no_fpu_for_embedded_devices.diff
   branches/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff
Modified:
   branches/qt4-x11/debian/TODO
   branches/qt4-x11/debian/changelog
   branches/qt4-x11/debian/patches/31_arm_eabi_fix.diff
   branches/qt4-x11/debian/patches/40_alpha_ice.diff
   branches/qt4-x11/debian/patches/41_disable_opengl_visibility.diff
   branches/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
   branches/qt4-x11/debian/patches/80_hurd_max_path.diff
   branches/qt4-x11/debian/patches/91_qmake_ldflags_as-needed.diff
   branches/qt4-x11/debian/patches/series
Log:
* Refresh Debian patches.
* Remove patches:
  * 21_assume_no_fpu_for_embedded_devices. Merged upstream.
    It breaks ABI on mips.
  * 30_arm_ftbfs_fixes. Merged upstream.


Modified: branches/qt4-x11/debian/TODO
===================================================================
--- branches/qt4-x11/debian/TODO	2007-12-26 19:53:27 UTC (rev 8553)
+++ branches/qt4-x11/debian/TODO	2007-12-26 20:37:00 UTC (rev 8554)
@@ -1,4 +1,4 @@
-* Review and port remaining patches to Qt4.4.0
+* Review and port qt-copy patches to Qt4.4.0
 * Fix dpkg-shlibdeps failure: couldn't find library libQtWebKit.so.4
    debian/qt4-designer/usr/lib/qt4/plugins/designer/libqaxwidget.so (its RPATH is '').
 * Find a way to enable exceptions only for XmlPatterns

Modified: branches/qt4-x11/debian/changelog
===================================================================
--- branches/qt4-x11/debian/changelog	2007-12-26 19:53:27 UTC (rev 8553)
+++ branches/qt4-x11/debian/changelog	2007-12-26 20:37:00 UTC (rev 8554)
@@ -22,9 +22,13 @@
     * Add DEB_DH_SHLIBDEPS_ARGS_ALL workaround.
     * Enable Phonon, WebKit and XmlPatterns.
     * Enable exceptions. It is a dependency to XmlPatterns module.
-  * Refresh patches: 01, 02, 03, 04, 05, 06, 07, 08.
-  * Disable all other patches.
+  * Refresh Debian patches.
+  * Disable qt-copy patches.
   * Add patch to fix phonon_gstreamer plugin install.
+  * Remove patches:
+    * 21_assume_no_fpu_for_embedded_devices. Merged upstream.
+      It breaks ABI on mips.
+    * 30_arm_ftbfs_fixes. Merged upstream.
   * Update .install files: libqt4-core, libqt4-gui and qt4-dev-tools.
   * Add packages: libqt4-dbus, libqt4-phonon , libqt4-webkit and
     libqt4-xmlpatterns.

Deleted: branches/qt4-x11/debian/patches/21_assume_no_fpu_for_embedded_devices.diff

Deleted: branches/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff

Modified: branches/qt4-x11/debian/patches/31_arm_eabi_fix.diff
===================================================================
--- branches/qt4-x11/debian/patches/31_arm_eabi_fix.diff	2007-12-26 19:53:27 UTC (rev 8553)
+++ branches/qt4-x11/debian/patches/31_arm_eabi_fix.diff	2007-12-26 20:37:00 UTC (rev 8554)
@@ -4,7 +4,7 @@
 
 --- a/src/corelib/global/qglobal.h
 +++ b/src/corelib/global/qglobal.h
-@@ -329,7 +329,7 @@
+@@ -428,7 +428,7 @@
  #  if defined(Q_OS_DARWIN) && __GNUC__ == 3 && (__GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 3)
  #    define Q_BROKEN_DEBUG_STREAM
  #  endif

Modified: branches/qt4-x11/debian/patches/40_alpha_ice.diff
===================================================================
--- branches/qt4-x11/debian/patches/40_alpha_ice.diff	2007-12-26 19:53:27 UTC (rev 8553)
+++ branches/qt4-x11/debian/patches/40_alpha_ice.diff	2007-12-26 20:37:00 UTC (rev 8554)
@@ -1,6 +1,6 @@
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -67,14 +67,7 @@
+@@ -71,14 +71,7 @@
  {
  public:
      static QSettings *findConfiguration();
@@ -16,7 +16,7 @@
      static QSettings *configuration()
      {
  #ifdef QT_NO_THREAD
-@@ -93,6 +86,15 @@
+@@ -97,6 +90,15 @@
      }
  };
  
@@ -34,7 +34,7 @@
      settings = QLibraryInfoPrivate::findConfiguration();
 --- a/src/corelib/tools/qhash.h
 +++ b/src/corelib/tools/qhash.h
-@@ -477,7 +477,7 @@
+@@ -492,7 +492,7 @@
  }
  
  template <class Key, class T>

Modified: branches/qt4-x11/debian/patches/41_disable_opengl_visibility.diff
===================================================================
--- branches/qt4-x11/debian/patches/41_disable_opengl_visibility.diff	2007-12-26 19:53:27 UTC (rev 8553)
+++ branches/qt4-x11/debian/patches/41_disable_opengl_visibility.diff	2007-12-26 20:37:00 UTC (rev 8554)
@@ -2,7 +2,7 @@
 
 --- a/src/opengl/opengl.pro
 +++ b/src/opengl/opengl.pro
-@@ -5,6 +5,7 @@
+@@ -6,6 +6,7 @@
  win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000
  solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
  

Modified: branches/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
===================================================================
--- branches/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff	2007-12-26 19:53:27 UTC (rev 8553)
+++ branches/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff	2007-12-26 20:37:00 UTC (rev 8554)
@@ -4,7 +4,7 @@
 
 --- a/src/corelib/global/qglobal.h
 +++ b/src/corelib/global/qglobal.h
-@@ -123,6 +123,12 @@
+@@ -201,6 +201,12 @@
  #  define Q_OS_RELIANT
  #elif defined(__linux__) || defined(__linux)
  #  define Q_OS_LINUX
@@ -17,7 +17,7 @@
  #elif defined(__FreeBSD__) || defined(__DragonFly__)
  #  define Q_OS_FREEBSD
  #  define Q_OS_BSD4
-@@ -143,8 +149,6 @@
+@@ -221,8 +227,6 @@
  #  define Q_OS_AIX
  #elif defined(__Lynx__)
  #  define Q_OS_LYNX
@@ -28,15 +28,17 @@
  #elif defined(__QNXNTO__)
 --- a/src/corelib/plugin/qlibrary.cpp
 +++ b/src/corelib/plugin/qlibrary.cpp
-@@ -291,11 +291,11 @@
+@@ -293,13 +293,13 @@
  
  #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
  
 -#if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX)
 +#if defined(Q_OS_FREEBSD) || defined(Q_OS_GLIBC)
  #  define USE_MMAP
+ QT_BEGIN_INCLUDE_NAMESPACE
  #  include <sys/types.h>
  #  include <sys/mman.h>
+ QT_END_INCLUDE_NAMESPACE
 -#endif // Q_OS_FREEBSD || Q_OS_LINUX
 +#endif // Q_OS_FREEBSD || Q_OS_GLIBC
  
@@ -44,7 +46,7 @@
                               const char *pattern, ulong p_len)
 --- a/src/corelib/tools/qlocale.cpp
 +++ b/src/corelib/tools/qlocale.cpp
-@@ -61,7 +61,7 @@
+@@ -73,7 +73,7 @@
  #include <qdebug.h>
  #include <time.h>
  
@@ -53,7 +55,7 @@
  #    include <fenv.h>
  #endif
  
-@@ -5927,7 +5927,7 @@
+@@ -6284,7 +6284,7 @@
      _control87(MCW_EM, MCW_EM);
  #endif
  
@@ -62,7 +64,7 @@
      fenv_t envp;
      feholdexcept(&envp);
  #endif
-@@ -5943,7 +5943,7 @@
+@@ -6300,7 +6300,7 @@
  #endif //_M_X64
  #endif //Q_OS_WIN
  

Modified: branches/qt4-x11/debian/patches/80_hurd_max_path.diff
===================================================================
--- branches/qt4-x11/debian/patches/80_hurd_max_path.diff	2007-12-26 19:53:27 UTC (rev 8553)
+++ branches/qt4-x11/debian/patches/80_hurd_max_path.diff	2007-12-26 20:37:00 UTC (rev 8554)
@@ -2,10 +2,10 @@
 
 --- a/src/corelib/io/qfsfileengine_unix.cpp
 +++ b/src/corelib/io/qfsfileengine_unix.cpp
-@@ -53,6 +53,10 @@
- # include <private/qcore_mac_p.h>
- #endif
+@@ -56,6 +56,10 @@
  
+ QT_BEGIN_NAMESPACE
+ 
 +#ifndef PATH_MAX
 +#define PATH_MAX 4096
 +#endif

Modified: branches/qt4-x11/debian/patches/91_qmake_ldflags_as-needed.diff
===================================================================
--- branches/qt4-x11/debian/patches/91_qmake_ldflags_as-needed.diff	2007-12-26 19:53:27 UTC (rev 8553)
+++ branches/qt4-x11/debian/patches/91_qmake_ldflags_as-needed.diff	2007-12-26 20:37:00 UTC (rev 8554)
@@ -4,8 +4,8 @@
  
  QMAKE_LINK		= g++
  QMAKE_LINK_SHLIB	= g++
--QMAKE_LFLAGS		+=
-+QMAKE_LFLAGS		+= -Wl,--as-needed
+-QMAKE_LFLAGS		+= -Wl,--no-undefined
++QMAKE_LFLAGS		+= -Wl,--no-undefined -Wl,--as-needed
  QMAKE_LFLAGS_RELEASE	+=
  QMAKE_LFLAGS_DEBUG	+=
  QMAKE_LFLAGS_APP	+=

Modified: branches/qt4-x11/debian/patches/series
===================================================================
--- branches/qt4-x11/debian/patches/series	2007-12-26 19:53:27 UTC (rev 8553)
+++ branches/qt4-x11/debian/patches/series	2007-12-26 20:37:00 UTC (rev 8554)
@@ -26,15 +26,13 @@
 07_trust_dpkg-arch_over_uname-m.diff
 08_load_ssl.diff
 09_install_phonon_gstreamer.diff
-# 20_mips_atomic_ops.diff
-# #21_assume_no_fpu_for_embedded_devices.diff
-# 30_arm_ftbfs_fixes.diff
-# 31_arm_eabi_fix.diff
-# 40_alpha_ice.diff
-# 41_disable_opengl_visibility.diff
-# 50_kfreebsd_build_fix.diff
-# 60_m68k_inotify_fix.diff
-# 70_hppa_ldcw_fix.diff
-# 80_hurd_max_path.diff
-# 90_qmake_cxxflags_fpermissive.diff
-# 91_qmake_ldflags_as-needed.diff
+20_mips_atomic_ops.diff
+31_arm_eabi_fix.diff
+40_alpha_ice.diff
+41_disable_opengl_visibility.diff
+50_kfreebsd_build_fix.diff
+60_m68k_inotify_fix.diff
+70_hppa_ldcw_fix.diff
+80_hurd_max_path.diff
+90_qmake_cxxflags_fpermissive.diff
+91_qmake_ldflags_as-needed.diff

More information about the pkg-kde-commits mailing list