[Pkg-kde-commits] rev 2178 - trunk/packages/kdelibs/debian/patches
Christopher Martin
chrsmrtn at costa.debian.org
Fri Nov 11 03:46:52 UTC 2005
Author: chrsmrtn
Date: 2005-11-11 03:46:51 +0000 (Fri, 11 Nov 2005)
New Revision: 2178
Modified:
trunk/packages/kdelibs/debian/patches/10_kstandarddirs.diff
trunk/packages/kdelibs/debian/patches/11_applications_menu.diff
trunk/packages/kdelibs/debian/patches/14_kaccel.diff
trunk/packages/kdelibs/debian/patches/17_kdelibs_rubberband.diff
trunk/packages/kdelibs/debian/patches/18_applications_menu_rename.diff
trunk/packages/kdelibs/debian/patches/19_debianize_useragent.diff
trunk/packages/kdelibs/debian/patches/21_kfreebsd_support.diff
Log:
Re-sync patches for 3.5.0-rc1.
Modified: trunk/packages/kdelibs/debian/patches/10_kstandarddirs.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/10_kstandarddirs.diff 2005-11-11 03:45:56 UTC (rev 2177)
+++ trunk/packages/kdelibs/debian/patches/10_kstandarddirs.diff 2005-11-11 03:46:51 UTC (rev 2178)
@@ -30,13 +30,3 @@
if (!strcmp(type, "wallpaper"))
return "share/wallpapers/";
if (!strcmp(type, "templates"))
-@@ -1285,6 +1289,9 @@
- }
- }
- #ifndef Q_OS_WIN //no default KDEDIR on win32 defined
-+ // UGLY HACK - Chris Cheney
-+ kdedirList.append("/usr/local");
-+ //
- kdedirList.append(KDEDIR);
- #endif
-
Modified: trunk/packages/kdelibs/debian/patches/11_applications_menu.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/11_applications_menu.diff 2005-11-11 03:45:56 UTC (rev 2177)
+++ trunk/packages/kdelibs/debian/patches/11_applications_menu.diff 2005-11-11 03:46:51 UTC (rev 2178)
@@ -1,6 +1,6 @@
--- kdelibs-orig/kded/applications.menu
+++ kdelibs-patched/kded/applications.menu
-@@ -378,4 +378,11 @@
+@@ -466,4 +466,11 @@
</Include>
<DefaultMergeDirs/>
<MergeFile>applications-kmenuedit.menu</MergeFile>
Modified: trunk/packages/kdelibs/debian/patches/14_kaccel.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/14_kaccel.diff 2005-11-11 03:45:56 UTC (rev 2177)
+++ trunk/packages/kdelibs/debian/patches/14_kaccel.diff 2005-11-11 03:46:51 UTC (rev 2178)
@@ -1,6 +1,6 @@
--- kdelibs-orig/kdecore/kaccel.cpp
+++ kdelibs-patched/kdecore/kaccel.cpp
-@@ -125,7 +125,10 @@
+@@ -127,7 +127,10 @@
return false;
if( pEvent->type == XKeyPress ) {
Modified: trunk/packages/kdelibs/debian/patches/17_kdelibs_rubberband.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/17_kdelibs_rubberband.diff 2005-11-11 03:45:56 UTC (rev 2177)
+++ trunk/packages/kdelibs/debian/patches/17_kdelibs_rubberband.diff 2005-11-11 03:46:51 UTC (rev 2178)
@@ -76,7 +76,7 @@
}
--- kde.orig/kdeui/kiconview.cpp
+++ kde.patched/kdeui/kiconview.cpp
-@@ -545,7 +545,7 @@
+@@ -548,7 +548,7 @@
r = m_wordWrap->boundingRect();
int realWidth = QMAX( QMIN( r.width() + 4, tw ), fm->width( "X" ) );
@@ -85,7 +85,7 @@
itemTextRect.setHeight( r.height() );
int w = 0; int h = 0; int y = 0;
-@@ -696,11 +696,13 @@
+@@ -699,11 +699,13 @@
void KIconViewItem::paintText( QPainter *p, const QColorGroup &cg )
{
@@ -125,7 +125,7 @@
QPixmap mPixmap;
int mMinimumWidth;
};
-@@ -142,6 +145,8 @@
+@@ -141,6 +144,8 @@
mIconList->verticalScrollBar()->installEventFilter( this );
connect( mIconList, SIGNAL(selectionChanged()), SLOT(slotShowPage()));
@@ -134,7 +134,7 @@
hbox->addSpacing( KDialog::marginHint() );
page = new QFrame( this );
hbox->addWidget( page, 10 );
-@@ -260,7 +265,7 @@
+@@ -259,7 +264,7 @@
}
QFrame *KJanusWidget::addPage( const QString &itemName, const QString &header,
@@ -143,7 +143,7 @@
{
QStringList items;
items << itemName;
-@@ -270,8 +275,8 @@
+@@ -269,8 +274,8 @@
QVBox *KJanusWidget::addVBoxPage( const QStringList &items,
@@ -154,7 +154,7 @@
{
if( !mValid )
{
-@@ -722,6 +727,12 @@
+@@ -721,6 +726,12 @@
it->setOpen(!it->isOpen());
}
@@ -167,7 +167,7 @@
void KJanusWidget::setFocus()
{
if( !mValid ) { return; }
-@@ -930,11 +941,11 @@
+@@ -929,11 +940,11 @@
KJanusWidget::IconListBox::IconListBox( QWidget *parent, const char *name,
WFlags f )
:KListBox( parent, name, f ), mShowAll(false), mHeightValid(false),
@@ -181,7 +181,7 @@
void KJanusWidget::IconListBox::updateMinimumHeight()
{
if( mShowAll && !mHeightValid )
-@@ -996,6 +1007,45 @@
+@@ -995,6 +1006,45 @@
}
@@ -227,7 +227,7 @@
KJanusWidget::IconListItem::IconListItem( QListBox *listbox, const QPixmap &pixmap,
const QString &text )
-@@ -1007,6 +1057,7 @@
+@@ -1006,6 +1056,7 @@
mPixmap = defaultPixmap();
}
setText( text );
@@ -235,7 +235,7 @@
mMinimumWidth = 0;
}
-@@ -1018,6 +1069,36 @@
+@@ -1017,6 +1068,36 @@
}
@@ -272,7 +272,7 @@
const QPixmap &KJanusWidget::IconListItem::defaultPixmap()
{
static QPixmap *pix=0;
-@@ -1045,15 +1126,34 @@
+@@ -1044,15 +1125,34 @@
void KJanusWidget::IconListItem::paint( QPainter *painter )
{
@@ -309,7 +309,7 @@
}
}
-@@ -1083,6 +1183,7 @@
+@@ -1082,6 +1182,7 @@
void KJanusWidget::virtual_hook( int, void* )
{ /*BASE::virtual_hook( id, data );*/ }
@@ -317,7 +317,7 @@
// TODO: In TreeList, if the last child of a node is removed, and there is no corrsponding widget for that node, allow the caller to
// delete the node.
void KJanusWidget::removePage( QWidget *page )
-@@ -1130,6 +1231,7 @@
+@@ -1129,6 +1230,7 @@
}
}
@@ -325,7 +325,7 @@
QString KJanusWidget::pageTitle(int index) const
{
if (!d || !d->mIntToTitle.contains(index))
-@@ -1138,6 +1240,7 @@
+@@ -1137,6 +1239,7 @@
return d->mIntToTitle[index];
}
Modified: trunk/packages/kdelibs/debian/patches/18_applications_menu_rename.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/18_applications_menu_rename.diff 2005-11-11 03:45:56 UTC (rev 2177)
+++ trunk/packages/kdelibs/debian/patches/18_applications_menu_rename.diff 2005-11-11 03:46:51 UTC (rev 2178)
@@ -1,6 +1,6 @@
--- kde.orig/kded/kbuildsycoca.cpp
+++ kde.patched/kded/kbuildsycoca.cpp
-@@ -378,7 +378,7 @@
+@@ -379,7 +379,7 @@
connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
this, SLOT(slotCreateEntry(const QString &, KService **)));
Modified: trunk/packages/kdelibs/debian/patches/19_debianize_useragent.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/19_debianize_useragent.diff 2005-11-11 03:45:56 UTC (rev 2177)
+++ trunk/packages/kdelibs/debian/patches/19_debianize_useragent.diff 2005-11-11 03:46:51 UTC (rev 2178)
@@ -1,6 +1,6 @@
--- kde.orig/kio/kio/kprotocolmanager.cpp
+++ kde.patched/kio/kio/kprotocolmanager.cpp
-@@ -464,6 +464,11 @@
+@@ -482,6 +482,11 @@
}
d->modifiers = modifiers;
d->useragent = CFG_DEFAULT_UAGENT(supp);
Modified: trunk/packages/kdelibs/debian/patches/21_kfreebsd_support.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/21_kfreebsd_support.diff 2005-11-11 03:45:56 UTC (rev 2177)
+++ trunk/packages/kdelibs/debian/patches/21_kfreebsd_support.diff 2005-11-11 03:46:51 UTC (rev 2178)
@@ -1,20 +1,20 @@
--- kde.orig/configure.in.in 2005-05-23 14:17:19.000000000 +0200
+++ kde.patched/configure.in.in 2005-08-27 23:48:59.000000000 +0200
-@@ -47,7 +47,7 @@
+@@ -48,7 +48,7 @@
KDE_CHECK_STL
AC_HEADER_DIRENT
AC_HEADER_STDC
-AC_CHECK_HEADERS(sys/param.h sys/mman.h sys/time.h sysent.h strings.h sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h termios.h)
+AC_CHECK_HEADERS(sys/param.h sys/mman.h sys/time.h sysent.h strings.h sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h termios.h sys/prctl.h)
- DCOPIDL2CPP="compiled"
- DCOPIDL="compiled"
-@@ -118,7 +118,7 @@
+ AC_ARG_WITH(acl,
+ [AC_HELP_STRING(--with-acl,
+@@ -164,7 +164,7 @@
AC_CHECK_MKSTEMPS
AC_CHECK_MKSTEMP
AC_CHECK_MKDTEMP
--AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday)
-+AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday tcgetattr tcsetattr)
+-AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority)
++AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority tcgetattr tcsetattr)
AH_BOTTOM([
/* provide a definition for a 32 bit entity, usable as a typedef, possibly
@@ -32,7 +32,7 @@
+#elif defined(TCGETS)
+# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
#else
--# if defined(_HPUX_SOURCE) || defined(__Lynx__)
+-# if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__)
-# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
-# else
-# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
@@ -48,8 +48,8 @@
+#elif defined(TCSETS)
+# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
#else
--# ifdef _HPUX_SOURCE
--# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
+-# if defined(_HPUX_SOURCE) || defined(__CYGWIN__)
+-# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
-# else
-# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
-# endif
@@ -68,7 +68,7 @@
#include <sys/prctl.h>
#ifndef PR_SET_NAME
#define PR_SET_NAME 15
-@@ -524,7 +524,7 @@
+@@ -535,7 +535,7 @@
d.argv[argc] = 0;
/** Give the process a new name **/
More information about the pkg-kde-commits
mailing list