rev 6188 - in trunk/packages/kdebase/debian: . patches
Sune Vuorela
pusling-guest at alioth.debian.org
Mon May 14 23:38:58 UTC 2007
Author: pusling-guest
Date: 2007-05-14 23:37:01 +0000 (Mon, 14 May 2007)
New Revision: 6188
Removed:
trunk/packages/kdebase/debian/patches/21_kwin_win_tab_desktop_switch_fix.diff
trunk/packages/kdebase/debian/patches/42_window_not_responding_64bit_fix.diff
trunk/packages/kdebase/debian/patches/44_no_install_opengl-logo.diff
trunk/packages/kdebase/debian/patches/45_plugin-keyboard-handler.diff
Modified:
trunk/packages/kdebase/debian/changelog
trunk/packages/kdebase/debian/patches/18_default_fonts.diff
trunk/packages/kdebase/debian/patches/27_kfreebsd_sysguard.diff
trunk/packages/kdebase/debian/patches/41_nspluginviewer_64bit_fix.diff
trunk/packages/kdebase/debian/patches/98_buildprep.diff
Log:
first 3.5.7 commit
Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog 2007-05-14 22:54:51 UTC (rev 6187)
+++ trunk/packages/kdebase/debian/changelog 2007-05-14 23:37:01 UTC (rev 6188)
@@ -1,3 +1,16 @@
+kdebase (4:3.5.7-1) unstable; urgency=low
+
+ * New upstream release
+ - redo patch 18 about fonts
+ - remove patch 21 - applied upstream
+ - adapt patch 27 - kfreebsd - minor changes
+ - adapt patch 41 - amd64 and nspluginviewer - small changes
+ - remove patch 42 - kwin and 64 bit. applied upstream
+ - remove patch 44 - opengl logo is fixed
+ - remove patch 45 - keyboard handler - applied upstream
+
+ -- Sune Vuorela <debian at pusling.com> Tue, 15 May 2007 00:00:58 +0200
+
kdebase (4:3.5.6.dfsg.2-2) unstable; urgency=low
* Add patch 45_plugin-keyboard-handler.diff to fix keyboard events handling.
Modified: trunk/packages/kdebase/debian/patches/18_default_fonts.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/18_default_fonts.diff 2007-05-14 22:54:51 UTC (rev 6187)
+++ trunk/packages/kdebase/debian/patches/18_default_fonts.diff 2007-05-14 23:37:01 UTC (rev 6188)
@@ -101,20 +101,23 @@
f4.setPointSize(10);
defaultFontList << f0 << f1 << f2 << f0 << f3 << f4 << f0;
---- kde.orig/kcontrol/krdb/krdb.cpp
-+++ kde.patched/kcontrol/krdb/krdb.cpp
-@@ -511,11 +511,11 @@
- {
- kglobals.setGroup("General");
+--- kdebase/kcontrol/krdb/krdb.cpp
++++ kdebase/kcontrol/krdb/krdb.cpp
+@@ -523,7 +523,7 @@
-- QString hintStyle(kglobals.readEntry("XftHintStyle", "hintmedium")),
-- subPixel(kglobals.readEntry("XftSubPixel"));
-+ QString hintStyle(kglobals.readEntry("XftHintStyle", "hintfull")),
-+ subPixel(kglobals.readEntry("XftSubPixel", "none"));
+ if (kglobals.hasKey("XftHintStyle"))
+ {
+- QString hintStyle = kglobals.readEntry("XftHintStyle", "hintmedium");
++ QString hintStyle = kglobals.readEntry("XftHintStyle", "hintfull");
+ contents += "Xft.hinting: ";
+ if(hintStyle.isEmpty())
+ contents += "-1\n";
+@@ -539,7 +539,7 @@
- contents += "Xft.antialias: ";
-- if(kglobals.readBoolEntry("XftAntialias", false))
-+ if(kglobals.readBoolEntry("XftAntialias", true))
- contents += "1";
- else
- contents += "0";
+ if (kglobals.hasKey("XftSubPixel"))
+ {
+- QString subPixel = kglobals.readEntry("XftSubPixel");
++ QString subPixel = kglobals.readEntry("XftSubPixel", "none");
+ if(!subPixel.isEmpty())
+ contents += "Xft.rgba: " + subPixel + '\n';
+ }
Deleted: trunk/packages/kdebase/debian/patches/21_kwin_win_tab_desktop_switch_fix.diff
Modified: trunk/packages/kdebase/debian/patches/27_kfreebsd_sysguard.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/27_kfreebsd_sysguard.diff 2007-05-14 22:54:51 UTC (rev 6187)
+++ trunk/packages/kdebase/debian/patches/27_kfreebsd_sysguard.diff 2007-05-14 23:37:01 UTC (rev 6188)
@@ -5,9 +5,9 @@
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
*-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
+ *-*-kfreebsd*-gnu) ksysguardd_compile=yes; UNAME='Linux' ;;
+ *-*-dragonfly*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
*-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;;
*-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
- *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
--- kde/configure 2005-08-29 01:42:54.000000000 +0200
+++ kde.patched/configure 2005-08-29 01:44:36.000000000 +0200
@@ -52915,6 +52915,7 @@
@@ -15,9 +15,9 @@
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
*-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
+ *-*-kfreebsd*-gnu) ksysguardd_compile=yes; UNAME='Linux' ;;
+ *-*-dragonfly*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
*-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;;
*-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
- *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
--- kde/ksysguard/configure.in.in 2005-08-29 09:59:21.000000000 +0200
+++ kde.patched/ksysguard/configure.in.in 2005-08-29 10:00:05.000000000 +0200
@@ -3,6 +3,7 @@
@@ -25,6 +25,6 @@
*-*-linux*) ksysguardd_compile=yes; UNAME='Linux' ;;
*-*-freebsd*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
+ *-*-kfreebsd*-gnu) ksysguardd_compile=yes; UNAME='Linux' ;;
+ *-*-dragonfly*) ksysguardd_compile=yes; UNAME='FreeBSD' ;;
*-*-netbsd*) ksysguardd_compile=yes; UNAME='NetBSD' ;;
*-*-solaris*) ksysguardd_compile=yes; UNAME='Solaris' ;;
- *-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
Modified: trunk/packages/kdebase/debian/patches/41_nspluginviewer_64bit_fix.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/41_nspluginviewer_64bit_fix.diff 2007-05-14 22:54:51 UTC (rev 6187)
+++ trunk/packages/kdebase/debian/patches/41_nspluginviewer_64bit_fix.diff 2007-05-14 23:37:01 UTC (rev 6188)
@@ -16,23 +16,23 @@
+typedef u_int16_t uint16;
#endif
#ifndef _UINT32
- #if defined(__alpha)
+ #if defined(__alpha) || defined(_AIX) || defined(__x86_64__) || defined(__LP64__)
typedef unsigned int uint32;
- #else /* __alpha */
+ #else /* __alpha || _AIX || __x86_64__ || __LP64__ */
-typedef unsigned long uint32;
+typedef u_int32_t uint32;
- #endif /* __alpha */
+ #endif /* __alpha || _AIX || __x86_64__ || __LP64__ */
#endif
#ifndef _INT16
-typedef short int16;
+typedef int16_t int16;
#endif
#ifndef _INT32
- #if defined(__alpha) || defined(_AIX)
+ #if defined(__alpha) || defined(_AIX) || defined(__x86_64__) || defined(__LP64__)
typedef int int32;
- #else /* __alpha || _AIX */
+ #else /* __alpha || _AIX || __x86_64__ || __LP64__ */
-typedef long int32;
+typedef int32_t int32;
- #endif /* __alpha || _AIX */
+ #endif /* __alpha || _AIX || __x86_64__ || __LP64__ */
#endif
Deleted: trunk/packages/kdebase/debian/patches/42_window_not_responding_64bit_fix.diff
Deleted: trunk/packages/kdebase/debian/patches/44_no_install_opengl-logo.diff
Deleted: trunk/packages/kdebase/debian/patches/45_plugin-keyboard-handler.diff
Modified: trunk/packages/kdebase/debian/patches/98_buildprep.diff
===================================================================
More information about the pkg-kde-commits
mailing list