summaryrefslogtreecommitdiff
path: root/packages/xqt2/files
diff options
context:
space:
mode:
Diffstat (limited to 'packages/xqt2/files')
-rw-r--r--packages/xqt2/files/KeyMap.patch19
-rw-r--r--packages/xqt2/files/cross.patch62
-rw-r--r--packages/xqt2/files/fephack.patch32
-rw-r--r--packages/xqt2/files/fix_qtscreen_HACK.patch55
-rw-r--r--packages/xqt2/files/fix_seqfault_qtscreen.patch13
-rw-r--r--packages/xqt2/files/imake-staging.patch38
-rw-r--r--packages/xqt2/files/moc_call.patch11
-rw-r--r--packages/xqt2/files/xchar2b.patch25
-rw-r--r--packages/xqt2/files/xqt-make.patch43
9 files changed, 0 insertions, 298 deletions
diff --git a/packages/xqt2/files/KeyMap.patch b/packages/xqt2/files/KeyMap.patch
deleted file mode 100644
index 62564cf248..0000000000
--- a/packages/xqt2/files/KeyMap.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- xc/../xqt2/xfree86/xqt-driver/KeyMap.h 2004-10-16 08:06:07.000000000 +0200
-+++ xc/../xqt2/xfree86/xqt-driver/KeyMap~.h 2006-05-10 19:41:16.000000000 +0200
-@@ -75,6 +75,7 @@
- /* [ */ K(BracketLeft, XK_bracketleft, XK_braceleft) // Fn+T
- /* { */ K(BraceLeft, XK_braceleft, NoSymbol) // ???
- /* cent */ K(cent, XK_cent, NoSymbol) // Fn+U
-+/* Enter */ K(Enter, XK_Return, NoSymbol)
- /* Return */ K(Return, XK_Return, NoSymbol)
- /* OK */ K(F33, XK_Return, NoSymbol)
- /* Control */ K(Control, XK_Control_L, NoSymbol)
-@@ -162,7 +163,7 @@
- /* F30 */ K(F30, XK_F30, NoSymbol)
- /* F31 */ K(F31, XK_F31, NoSymbol)
- /* F32 */ K(F32, XK_F32, NoSymbol)
--/* F33 */ K(F33, XK_F33, NoSymbol)
-+/* F33 */ /* K(F33, XK_F33, NoSymbol) */ // Key already defined as 'ok'
- /* F34 */ K(F34, XK_F34, NoSymbol)
- /* F35 */ K(F35, XK_F35, NoSymbol)
-
diff --git a/packages/xqt2/files/cross.patch b/packages/xqt2/files/cross.patch
deleted file mode 100644
index c00068aa26..0000000000
--- a/packages/xqt2/files/cross.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -ur xc.org/config/cf/X11.tmpl xc/config/cf/X11.tmpl
---- xc.org/config/cf/X11.tmpl 2003-02-26 06:57:52.000000000 +0900
-+++ xc/config/cf/X11.tmpl 2004-09-16 19:19:46.000000000 +0900
-@@ -1582,9 +1582,9 @@
- MKFONTDIR = $(CLIENTENVSETUP) $(PRELOADFONTSETUP) $(XBUILDBINDIR)/mkfontdir
- XCURSORGEN = $(CLIENTENVSETUP) $(PRELOADSETUP) $(XBUILDBINDIR)/xcursorgen
- # elif UseInstalledOnCrossCompile
-- MKFONTDIR = $(BINDIR)/mkfontdir
-- FONTC = $(BINDIR)/bdftopcf
-- XCURSORGEN = $(BINDIR)/xcursorgen
-+ MKFONTDIR = /usr/X11R6/bin/mkfontdir
-+ FONTC = /usr/X11R6/bin/bdftopcf
-+ XCURSORGEN = /usr/X11R6/bin/xcursorgen
- # endif
- # if HasPerl
- MKHTMLINDEX = RunPerlScript($(CONFIGSRC)/util/mkhtmlindex.pl,)
-diff -ur xc.org/config/cf/cross.def xc/config/cf/cross.def
---- xc.org/config/cf/cross.def 2002-04-04 23:05:33.000000000 +0900
-+++ xc/config/cf/cross.def 2004-09-16 19:19:46.000000000 +0900
-@@ -5,7 +5,7 @@
- * compiler images. It will have to be edited to reflect these
- * given your local configuration.
- */
--#if 0
-+#if 1
- #undef i386Architecture
- #define Arm32Architecture
-
-@@ -14,18 +14,18 @@
- #define ServerCDebugFlags -O2
- #undef StandardDefines
- #define StandardDefines -Dlinux -D__arm__ -D_POSIX_SOURCE \
-- -D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
-+ -D_BSD_SOURCE -D_GNU_SOURCE
- #undef CcCmd
--#define StdIncDir /skiff/local/arm-linux/include
-+#define StdIncDir $(TOPDIR)/tmp/cross/arm-linux/include
- #define PreIncDir
- #undef PostIncDir
--#define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include
--#define CcCmd /skiff/local/bin/arm-linux-gcc
-+#define PostIncDir $(TOPDIR)/tmp/cross/lib/gcc-lib/arm-linux/2.95.2/include
-+#define CcCmd $(TOPDIR)/tmp/cross/bin/arm-linux-gcc
- #undef CplusplusCmd
- #define HasCplusplus YES
--#define CplusplusCmd /skiff/local/bin/arm-linux-g++
-+#define CplusplusCmd $(TOPDIR)/tmp/cross/bin/arm-linux-g++
- #define DoRanlibCmd YES
--#define RanlibCmd /skiff/local/bin/arm-linux-ranlib
-+#define RanlibCmd $(TOPDIR)/tmp/cross/bin/arm-linux-ranlib
- #undef ExtraLoadFlags
- #define ExtraLoadFlags
- #define FbNoPixelAddrCode
-@@ -33,7 +33,7 @@
- #define TermcapLibrary -ltermcap
-
- #undef LdPostLib
--#define LdPostLib -L/skiff/local/arm-linux/lib
-+#define LdPostLib -L$(TOPDIR)/tmp/cross/arm-linux/lib
-
- #undef ExtensionOSDefines
- #define ExtensionOSDefines
diff --git a/packages/xqt2/files/fephack.patch b/packages/xqt2/files/fephack.patch
deleted file mode 100644
index c09a7ed507..0000000000
--- a/packages/xqt2/files/fephack.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur xc.org/lib/X11/KeyBind.c xc/lib/X11/KeyBind.c
---- xc.org/lib/X11/KeyBind.c 2001-12-15 04:54:02.000000000 +0900
-+++ xc/lib/X11/KeyBind.c 2004-09-16 19:19:46.000000000 +0900
-@@ -545,6 +545,13 @@
- unsigned int modifiers;
- KeySym symbol;
-
-+ /* X/Qt hack start */
-+ if (event->keycode & 0x100) {
-+ *buffer = event->keycode & 0xff;
-+ return 1;
-+ }
-+ /* X/Qt hack end */
-+
- if (! _XTranslateKey(event->display, event->keycode, event->state,
- &modifiers, &symbol))
- return 0;
-diff -ur xc.org/lib/X11/XlibInt.c xc/lib/X11/XlibInt.c
---- xc.org/lib/X11/XlibInt.c 2003-02-18 14:15:27.000000000 +0900
-+++ xc/lib/X11/XlibInt.c 2004-09-16 19:19:46.000000000 +0900
-@@ -2358,6 +2358,11 @@
- ev->state = event->u.keyButtonPointer.state;
- ev->same_screen = event->u.keyButtonPointer.sameScreen;
- ev->keycode = event->u.u.detail;
-+ /* X/Qt hack start */
-+ if (event->u.keyButtonPointer.pad1 == 0xff) {
-+ ev->keycode |= 0x100;
-+ }
-+ /* X/Qt hack end */
- }
- break;
- case ButtonPress:
diff --git a/packages/xqt2/files/fix_qtscreen_HACK.patch b/packages/xqt2/files/fix_qtscreen_HACK.patch
deleted file mode 100644
index 7e4b2c658a..0000000000
--- a/packages/xqt2/files/fix_qtscreen_HACK.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -Nur xc/../xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc xc/../xqt2/xfree86/xqt-driver/qtscreen.cc
---- xc/../xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc 2008-09-25 14:18:44.000000000 +0200
-+++ xc/../xqt2/xfree86/xqt-driver/qtscreen.cc 2008-09-25 14:28:30.000000000 +0200
-@@ -109,6 +109,7 @@
- desktopSize = newSize;
- fullScrSize = desktopSize;
- normalScrSize = fullScrSize;
-+ /* FIXME: get taskbar size from opie
- if (normalScrSize.height() >= 400) {
- normalScrSize.setHeight( normalScrSize.height() - 38);
- } else {
-@@ -117,7 +118,7 @@
-
- if (!g_fFullScreen) {
- fullScrSize = normalScrSize;
-- }
-+ }*/
-
- #ifdef DEBUG_SCR
- normalScrSize.setHeight(640);
-@@ -128,6 +129,7 @@
- setDisplaySize();
-
- #ifdef QWS
-+ /* FIXME: fix this more general
- // zaurus hack
- if (desktopSize.width() > desktopSize.height()) {
- shadow.setScrRandr(270);
-@@ -136,6 +138,10 @@
- shadow.setScrRandr(0);
- qtRandRRotate(0);
- }
-+ */
-+ // until that
-+ shadow.setScrRandr(0);
-+ qtRandRRotate(0);
- #endif
- }
-
-@@ -148,6 +154,7 @@
- *h = fullScrSize.height();
-
- #ifdef QWS
-+ /* FIXME: dix this more general
- // zaurus hack
- if (*w > *h) {
- // rotate!
-@@ -155,6 +162,7 @@
- *w = *h;
- *h = sw;
- }
-+ */
-
- *depth = 16; // 16bpp ¸ÇÄê
- *bits = NULL;
diff --git a/packages/xqt2/files/fix_seqfault_qtscreen.patch b/packages/xqt2/files/fix_seqfault_qtscreen.patch
deleted file mode 100644
index 43b97f4bdb..0000000000
--- a/packages/xqt2/files/fix_seqfault_qtscreen.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- xc/../xqt2.vanilla/xfree86/xqt-driver/qtscreen.cc 2009-02-08 15:47:33.000000000 +0100
-+++ xc/../xqt2/xfree86/xqt-driver/qtscreen.cc 2009-02-08 15:52:09.000000000 +0100
-@@ -406,7 +406,9 @@
- //
- void qtScreen::keyPressEvent(QKeyEvent *ev)
- {
-- static QTextCodec *codec = QTextCodec::codecForName("eucJP");
-+ //static QTextCodec *codec = QTextCodec::codecForName("eucJP");
-+ //Better to choose the locale - even better provide a command line switch!
-+ static QTextCodec *codec = QTextCodec::codecForLocale();
-
- #ifdef QWS
- QCString euc;
diff --git a/packages/xqt2/files/imake-staging.patch b/packages/xqt2/files/imake-staging.patch
deleted file mode 100644
index bf2e350830..0000000000
--- a/packages/xqt2/files/imake-staging.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- xc/config/cf/Imake.tmpl.orig 2004-07-28 04:24:29.000000000 +0100
-+++ xc/config/cf/Imake.tmpl 2004-09-14 21:03:06.000000000 +0100
-@@ -2038,11 +2038,11 @@
- */
- ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
- ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
-- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES)
-+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
- LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES)
- LDPRELIB = LdPreLib $(INSTALLED_LIBS)
- LDPOSTLIB = LdPostLib
-- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING)
- CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS)
-
- LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES)
---- xc/config/cf/Library.tmpl~ 2004-05-24 20:06:57.000000000 +0100
-+++ xc/config/cf/Library.tmpl 2004-09-14 21:10:29.000000000 +0100
-@@ -114,7 +114,7 @@
- STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
- CDEBUGFLAGS = LibraryCDebugFlags
- CLIBDEBUGFLAGS = LibraryDebugOpt
-- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES)
-+ CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING)
- # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags)
- PICFLAGS = LargePositionIndependentCFlags
- # endif
---- xc/config/cf/X11.tmpl~ 2004-09-03 17:18:18.000000000 +0100
-+++ xc/config/cf/X11.tmpl 2004-09-14 21:30:30.000000000 +0100
-@@ -3359,7 +3359,7 @@
- FREETYPE2LIBDIR = Freetype2LibDir
- FREETYPE2INCDIR = Freetype2IncDir
- #if Freetype2LibDirStandard
--FREETYPE2LIB = -lfreetype
-+FREETYPE2LIB = $(LD_STAGING) -lfreetype
- #else
- FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype
- #endif
diff --git a/packages/xqt2/files/moc_call.patch b/packages/xqt2/files/moc_call.patch
deleted file mode 100644
index 6e150e201a..0000000000
--- a/packages/xqt2/files/moc_call.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xc/../xqt2/xfree86/xqt-driver/Imakefile 2006-05-09 11:59:07.000000000 +0200
-+++ xc/../xqt2/xfree86/xqt-driver/Imakefile 2004-09-16 12:40:30.000000000 +0200
-@@ -12,7 +12,7 @@
-
- QTDIR = QtDir
-
--MOC = QtDir/bin/moc
-+MOC = MocBin
-
- INCLUDES = -I. \
- -I$(XBUILDINCDIR) -I$(FONTINCSRC) \
diff --git a/packages/xqt2/files/xchar2b.patch b/packages/xqt2/files/xchar2b.patch
deleted file mode 100644
index 5561bc4ec7..0000000000
--- a/packages/xqt2/files/xchar2b.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-* XChar2b patch
-
-This is *EXTREMELY* important patch to handle strings contains 2-byte character
-correctly on ARM architecture hardware.
-
-On ARM architecture, size of the XChar2b structure will be 4, because gcc
-adds 2 byte padding at the last of the structure. This will breaks the
-XChar2b stream!
-
-This patch makes the size of the structure to 2 byte, with
-__attribute__ ((packed)) declaration.
-
-
-diff -ur xc.org/lib/X11/Xlib.h xc/lib/X11/Xlib.h
---- xc.org/lib/X11/Xlib.h 2002-06-01 03:45:42.000000000 +0900
-+++ xc/lib/X11/Xlib.h 2004-09-16 19:19:46.000000000 +0900
-@@ -1059,7 +1059,7 @@
- typedef struct { /* normal 16 bit characters are two bytes */
- unsigned char byte1;
- unsigned char byte2;
--} XChar2b;
-+} __attribute__ ((packed)) XChar2b;
-
- typedef struct {
- XChar2b *chars; /* two byte characters */
diff --git a/packages/xqt2/files/xqt-make.patch b/packages/xqt2/files/xqt-make.patch
deleted file mode 100644
index f031b26794..0000000000
--- a/packages/xqt2/files/xqt-make.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -ur xc.org/programs/Xserver/Imakefile xc/programs/Xserver/Imakefile
---- xc.org/programs/Xserver/Imakefile 2003-02-18 02:06:40.000000000 +0900
-+++ xc/programs/Xserver/Imakefile 2004-09-16 19:37:14.000000000 +0900
-@@ -1350,13 +1350,38 @@
-
- #endif /* XDarwinServer */
-
-+#if defined(XqtXServer)
-+XCOMM
-+XCOMM Xqt Server Section
-+XCOMM
-+
-+QTDIR = QtDir
-+
-+KDDIRS = StdKdDirs
-+
-+XQTDDXDIR = hw/xqt
-+SHADOWDIR = miext/shadow
-+XQTDIRS = $(STDDIRS) $(KDDIRS) $(XQTDDXDIR) $(SHADOWDIR) $(LAYERDIR) $(DEPDIRS)
-+
-+XQTLIB = $(XQTDDXDIR)/LibraryTargetName(xqt)
-+XQTOBJS =
-+
-+XQTLIBS = PreFbLibs $(XQTLIB) KdLibs $(SHADOW) $(LAYER) FbPostFbLibs
-+XQTSYSLIBS = StdKdSysLibs -L$(QTDIR)/lib QtLibs
-+
-+/* C++ linker must be used to build Xqt server */
-+CCLINK = $(CXXLINK)
-+
-+ServerTarget(Xqt,$(XQTDIRS),$(XQTOBJS),$(XQTLIBS),$(XQTSYSLIBS))
-+#endif /* XqtServer */
-+
-
- CFBDIRS = $(CFB8DIR) $(CFB16DIR) $(CFB24DIR) $(CFB32DIR)
- MIEXTDIRS = $(SHADOWDIR) $(LAYERDIR)
- IPLANDIRS = $(IPLAN2P2DIR) $(IPLAN2P4DIR) $(IPLAN2P8DIR)
- DDXDIRS = $(DECWSDDXDIR) $(SUNDDXDIR) $(LYNXDDXDIR) \
- $(HPDDXDIR) $(XFREE86DDXDIR) $(XWINDDXDIR) $(DARWINDDXDIR) \
-- $(XVFBDDXDIR) $(XNESTDDXDIR)
-+ $(XVFBDDXDIR) $(XNESTDDXDIR) $(XQTDDXDIR)
- SUBDIRS = $(STDDIRS) $(MFBDIR) $(CFBDIRS) $(IPLANDIRS) $(ILBMDIR) $(AFBDIR) \
- $(LMFCFBDIR) $(DDXDIRS) $(FBDIR) $(KDRIVEDIRS) $(MIEXTDIRS) \
- $(XWINPARSERDIR)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 16:07:55 +0000