summaryrefslogtreecommitdiff
path: root/x11/kdebase3/patches
diff options
context:
space:
mode:
Diffstat (limited to 'x11/kdebase3/patches')
-rw-r--r--x11/kdebase3/patches/patch-ai12
-rw-r--r--x11/kdebase3/patches/patch-ar175
2 files changed, 14 insertions, 173 deletions
diff --git a/x11/kdebase3/patches/patch-ai b/x11/kdebase3/patches/patch-ai
index 79d890d78c4..5b8f4cfa9b6 100644
--- a/x11/kdebase3/patches/patch-ai
+++ b/x11/kdebase3/patches/patch-ai
@@ -1,11 +1,11 @@
-$NetBSD: patch-ai,v 1.13 2007/02/15 14:06:49 joerg Exp $
+$NetBSD: patch-ai,v 1.14 2007/10/20 10:37:20 markd Exp $
---- libkonq/Makefile.in.orig 2007-02-12 20:12:15.000000000 +0000
+--- libkonq/Makefile.in.orig 2007-10-09 03:40:30.000000000 +1300
+++ libkonq/Makefile.in
-@@ -646,7 +646,7 @@ lib_LTLIBRARIES = libkonq.la
- #>- libkonq_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
- #>+ 1
- libkonq_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined $(KDE_NO_UNDEFINED)
+@@ -521,7 +521,7 @@ INCLUDES = -I$(kde_includes)/arts $(all_
+ SUBDIRS = pics favicons
+ lib_LTLIBRARIES = libkonq.la
+ libkonq_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
-libkonq_la_LIBADD = $(LIB_KPARTS)
+libkonq_la_LIBADD = $(LIB_KPARTS) -lz
#>- libkonq_la_SOURCES = konq_popupmenu.cc knewmenu.cc \
diff --git a/x11/kdebase3/patches/patch-ar b/x11/kdebase3/patches/patch-ar
index 9ebd7774fc1..25b67812203 100644
--- a/x11/kdebase3/patches/patch-ar
+++ b/x11/kdebase3/patches/patch-ar
@@ -1,168 +1,9 @@
-$NetBSD: patch-ar,v 1.4 2007/06/08 12:35:38 markd Exp $
+$NetBSD: patch-ar,v 1.5 2007/10/20 10:37:20 markd Exp $
-kde svn patch 669488
-
---- konsole/konsole/main.cpp.orig 2007/03/13 12:29:16 642131
-+++ konsole/konsole/main.cpp 2007/05/29 14:32:54 669488
-@@ -46,18 +46,15 @@
-
- #include "konsole.h"
-
--// COMPOSITE disabled by default because the QApplication constructor
--// needed to enable the ARGB32 visual has undesired side effects.
--//#if 0
- #if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
- #define COMPOSITE
- #endif
--//#endif
-
- #ifdef COMPOSITE
- # include <X11/Xlib.h>
- # include <X11/extensions/Xrender.h>
- # include <fixx11h.h>
-+# include <dlfcn.h>
- #endif
-
- static const char description[] =
-@@ -255,47 +252,62 @@
- if( qtargs->isSet("font") )
- kdWarning() << "The Qt option -fn, --font has no effect." << endl;
-
-+ KApplication* a = NULL;
- #ifdef COMPOSITE
-- char *display = 0;
-- if ( qtargs->isSet("display"))
-- display = qtargs->getOption( "display" ).data();
--
-- Display *dpy = XOpenDisplay( display );
-- if ( !dpy ) {
-- kdError() << "cannot connect to X server " << display << endl;
-- exit( 1 );
-- }
--
-- int screen = DefaultScreen( dpy );
-- Colormap colormap = 0;
-- Visual *visual = 0;
-- int event_base, error_base;
--
-- if ( args->isSet("real-transparency") && XRenderQueryExtension( dpy, &event_base, &error_base ) )
-- {
-- int nvi;
-- XVisualInfo templ;
-- templ.screen = screen;
-- templ.depth = 32;
-- templ.c_class = TrueColor;
-- XVisualInfo *xvi = XGetVisualInfo( dpy, VisualScreenMask | VisualDepthMask
-- | VisualClassMask, &templ, &nvi );
--
-- for ( int i = 0; i < nvi; i++ ) {
-- XRenderPictFormat *format = XRenderFindVisualFormat( dpy, xvi[i].visual );
-- if ( format->type == PictTypeDirect && format->direct.alphaMask ) {
-- visual = xvi[i].visual;
-- colormap = XCreateColormap( dpy, RootWindow( dpy, screen ), visual, AllocNone );
-- kdDebug() << "found visual with alpha support" << endl;
-- argb_visual = true;
-- break;
-+ if ( args->isSet("real-transparency")) {
-+ char *display = 0;
-+ if ( qtargs->isSet("display"))
-+ display = qtargs->getOption( "display" ).data();
-+
-+ Display *dpy = XOpenDisplay( display );
-+ if ( !dpy ) {
-+ kdError() << "cannot connect to X server " << display << endl;
-+ exit( 1 );
-+ }
-+
-+ int screen = DefaultScreen( dpy );
-+ Colormap colormap = 0;
-+ Visual *visual = 0;
-+ int event_base, error_base;
-+
-+ if ( XRenderQueryExtension( dpy, &event_base, &error_base ) ) {
-+ int nvi;
-+ XVisualInfo templ;
-+ templ.screen = screen;
-+ templ.depth = 32;
-+ templ.c_class = TrueColor;
-+ XVisualInfo *xvi = XGetVisualInfo( dpy, VisualScreenMask | VisualDepthMask
-+ | VisualClassMask, &templ, &nvi );
-+
-+ for ( int i = 0; i < nvi; i++ ) {
-+ XRenderPictFormat *format = XRenderFindVisualFormat( dpy, xvi[i].visual );
-+ if ( format->type == PictTypeDirect && format->direct.alphaMask ) {
-+ visual = xvi[i].visual;
-+ colormap = XCreateColormap( dpy, RootWindow( dpy, screen ), visual, AllocNone );
-+ kdDebug() << "found visual with alpha support" << endl;
-+ argb_visual = true;
-+ break;
-+ }
- }
- }
-- }
-+ // The QApplication ctor used is normally intended for applications not using Qt
-+ // as the primary toolkit (e.g. Motif apps also using Qt), with some slightly
-+ // unpleasant side effects (e.g. #83974). This code checks if qt-copy patch #0078
-+ // is applied, which allows turning this off.
-+ bool* qt_no_foreign_hack = static_cast< bool* >( dlsym( RTLD_DEFAULT, "qt_no_foreign_hack" ));
-+ if( qt_no_foreign_hack )
-+ *qt_no_foreign_hack = true;
-+ // else argb_visual = false ... ? *shrug*
-
-- KApplication a( dpy, Qt::HANDLE( visual ), Qt::HANDLE( colormap ) );
-+ if( argb_visual )
-+ a = new KApplication( dpy, Qt::HANDLE( visual ), Qt::HANDLE( colormap ) );
-+ else
-+ XCloseDisplay( dpy );
-+ }
-+ if( a == NULL )
-+ a = new KApplication;
- #else
-- KApplication a;
-+ KApplication* a = new KApplication;
- #endif
-
- QString dataPathBase = KStandardDirs::kde_default("data").append("konsole/");
-@@ -351,7 +363,7 @@
- fixed_size = !args->isSet("resize");
-
- if (!full_script)
-- a.dcopClient()->setQtBridgeEnabled(false);
-+ a->dcopClient()->setQtBridgeEnabled(false);
-
- QCString type = "";
-
-@@ -467,13 +479,13 @@
- putenv((char*)"COLORTERM="); // to trigger mc's color detection
- KonsoleSessionManaged ksm;
-
-- if (a.isRestored() || !profile.isEmpty())
-+ if (a->isRestored() || !profile.isEmpty())
- {
- if (!shell)
- shell = konsole_shell(eargs);
-
- if (profile.isEmpty())
-- sessionconfig = a.sessionConfig();
-+ sessionconfig = a->sessionConfig();
- sessionconfig->setDesktopGroup();
- int n = 1;
-
-@@ -629,7 +641,7 @@
- m->setAutoClose(auto_close);
- }
-
-- int ret = a.exec();
-+ int ret = a->exec();
-
- //// Temporary code, waiting for Qt to do this properly
-
-@@ -654,6 +666,8 @@
- delete w;
- }
- delete list;
-+
-+ delete a;
-
- return ret;
- }
+--- applnk/old_desktop_files.orig 2005-09-10 20:25:45.000000000 +1200
++++ applnk/old_desktop_files
+@@ -1,4 +1,3 @@
+-kgamma.desktop
+ randr.desktop
+ xinerama.desktop
+ energy.desktop
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 04:18:53 +0000