diff options
Diffstat (limited to 'source/x/x11/patch')
| -rw-r--r-- | source/x/x11/patch/compiz.patch | 3 | ||||
| -rw-r--r-- | source/x/x11/patch/compiz/compiz-0.7.8-kde42-crash.patch | 66 | ||||
| -rw-r--r-- | source/x/x11/patch/compiz/compiz-0.7.8-kde42-krunner.patch | 19 | ||||
| -rw-r--r-- | source/x/x11/patch/compiz/compiz-0.7.8-kde42.patch | 89 | ||||
| -rw-r--r-- | source/x/x11/patch/xcursorgen.patch | 1 | ||||
| -rw-r--r-- | source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff | 61 | ||||
| -rw-r--r-- | source/x/x11/patch/xf86-input-synaptics.patch | 4 | ||||
| -rw-r--r-- | source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff | 11 | ||||
| -rw-r--r-- | source/x/x11/patch/xorg-server.patch | 1 | ||||
| -rw-r--r-- | source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff | 11 | ||||
| -rw-r--r-- | source/x/x11/patch/xscope.patch | 1 | ||||
| -rw-r--r-- | source/x/x11/patch/xscope/xscope-1.1-scope.c.diff | 11 |
12 files changed, 89 insertions, 189 deletions
diff --git a/source/x/x11/patch/compiz.patch b/source/x/x11/patch/compiz.patch deleted file mode 100644 index c2920994d..000000000 --- a/source/x/x11/patch/compiz.patch +++ /dev/null @@ -1,3 +0,0 @@ -zcat $CWD/patch/compiz/compiz-0.7.8-kde42-crash.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patch/compiz/compiz-0.7.8-kde42-krunner.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patch/compiz/compiz-0.7.8-kde42.patch.gz | patch -p1 --verbose || exit 1 diff --git a/source/x/x11/patch/compiz/compiz-0.7.8-kde42-crash.patch b/source/x/x11/patch/compiz/compiz-0.7.8-kde42-crash.patch deleted file mode 100644 index 00f89e2cd..000000000 --- a/source/x/x11/patch/compiz/compiz-0.7.8-kde42-crash.patch +++ /dev/null @@ -1,66 +0,0 @@ -Implement KDecorationBridge unstable API, needed for KDE 4.2. ---- - -diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp -index d2d362b..68c856b 100644 ---- a/kde/window-decorator-kde4/window.cpp -+++ b/kde/window-decorator-kde4/window.cpp -@@ -764,6 +764,31 @@ KWD::Window::grabXServer (bool) - } - - void -+KWD::Window::repaintShadow (void) -+{ -+} -+ -+bool -+KWD::Window::compositingActive (void) const -+{ -+ return true; -+} -+ -+bool -+KWD::Window::shadowsActive (void) const -+{ -+ /* we are drawing the shadows ourselves, no need for the -+ decoration engine to do so */ -+ return false; -+} -+ -+double -+KWD::Window::opacity (void) const -+{ -+ return 1.0; -+} -+ -+void - KWD::Window::createDecoration (void) - { - KDecoration *decor; -diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h -index bdf2c47..034e6fe 100644 ---- a/kde/window-decorator-kde4/window.h -+++ b/kde/window-decorator-kde4/window.h -@@ -45,7 +45,7 @@ class QMenu; - - namespace KWD - { --class Window:public QWidget, public KDecorationBridge { -+class Window:public QWidget, public KDecorationBridgeUnstable { - Q_OBJECT public: - - enum Type -@@ -104,6 +104,12 @@ class Window:public QWidget, public KDecorationBridge { - virtual Qt::WFlags initialWFlags (void) const; - virtual void grabXServer (bool grab); - -+ /* unstable API */ -+ virtual void repaintShadow (); -+ virtual bool compositingActive () const; -+ virtual bool shadowsActive () const; -+ virtual double opacity () const; -+ - void handleActiveChange (void); - void updateFrame (WId frame); - void updateWindowGeometry (void); - diff --git a/source/x/x11/patch/compiz/compiz-0.7.8-kde42-krunner.patch b/source/x/x11/patch/compiz/compiz-0.7.8-kde42-krunner.patch deleted file mode 100644 index 3de71af82..000000000 --- a/source/x/x11/patch/compiz/compiz-0.7.8-kde42-krunner.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/kde/window-decorator-kde4/decorator.cpp b/kde/window-decorator-kde4/decorator.cpp -index 96b818d..0bf4718 100644 ---- a/kde/window-decorator-kde4/decorator.cpp -+++ b/kde/window-decorator-kde4/decorator.cpp -@@ -649,9 +649,10 @@ KWD::Decorator::x11EventFilter (XEvent *xevent) - } - else if (action == Atoms::toolkitActionRunDialogAtom) - { -- QDBusInterface krunner ("org.kde.krunner", "/Interface", -- "org.kde.krunner.Interface"); -- krunner.call ("display", ""); -+ QDBusInterface krunner ("org.kde.krunner", "/App", -+ "org.kde.krunner.App"); -+ if (krunner.isValid ()) -+ krunner.call ("display"); - } - else if (action == Atoms::toolkitActionForceQuitDialogAtom) - { - diff --git a/source/x/x11/patch/compiz/compiz-0.7.8-kde42.patch b/source/x/x11/patch/compiz/compiz-0.7.8-kde42.patch deleted file mode 100644 index 0f9962233..000000000 --- a/source/x/x11/patch/compiz/compiz-0.7.8-kde42.patch +++ /dev/null @@ -1,89 +0,0 @@ -diff -ur compiz-0.7.8/configure compiz-0.7.8-kde42/configure ---- compiz-0.7.8/configure 2008-09-17 13:34:28.000000000 +0200 -+++ compiz-0.7.8-kde42/configure 2008-12-01 19:07:49.000000000 +0100 -@@ -25429,7 +25429,7 @@ - kde4libs=`kde4-config --install lib --expandvars 2>/dev/null` - kde4incs=`kde4-config --install include --expandvars 2>/dev/null` - -- kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/panelsvg.h" -+ kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/framesvg.h" - - { echo "$as_me:$LINENO: checking for KWin headers" >&5 - echo $ECHO_N "checking for KWin headers... $ECHO_C" >&6; } -diff -ur compiz-0.7.8/configure.ac compiz-0.7.8-kde42/configure.ac ---- compiz-0.7.8/configure.ac 2008-09-17 13:33:40.000000000 +0200 -+++ compiz-0.7.8-kde42/configure.ac 2008-12-01 19:07:33.000000000 +0100 -@@ -487,7 +487,7 @@ - kde4libs=`kde4-config --install lib --expandvars 2>/dev/null` - kde4incs=`kde4-config --install include --expandvars 2>/dev/null` - -- kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/panelsvg.h" -+ kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/framesvg.h" - - dnl Check for KWin headers - AC_MSG_CHECKING([for KWin headers]) -diff -ur compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.cpp ---- compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp 2008-08-08 13:20:31.000000000 +0200 -+++ compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.cpp 2008-12-01 19:13:18.000000000 +0100 -@@ -30,7 +30,7 @@ - - #include <fixx11h.h> - --#include <KDE/Plasma/PanelSvg> -+#include <KDE/Plasma/FrameSvg> - #include <KDE/Plasma/Theme> - - #include <kwindowsystem.h> -@@ -46,9 +46,9 @@ - QColor color; - color = Plasma::Theme::defaultTheme ()->color (Plasma::Theme::TextColor); - -- mBackground = new Plasma::PanelSvg(); -+ mBackground = new Plasma::FrameSvg(); - mBackground->setImagePath ("dialogs/background"); -- mBackground->setEnabledBorders(Plasma::PanelSvg::AllBorders); -+ mBackground->setEnabledBorders(Plasma::FrameSvg::AllBorders); - - mBorder.left = mBackground->marginSize(Plasma::LeftMargin); - mBorder.right = mBackground->marginSize(Plasma::RightMargin); -@@ -131,8 +131,8 @@ - p.setCompositionMode (QPainter::CompositionMode_Source); - p.setRenderHint (QPainter::SmoothPixmapTransform); - -- mBackground->resizePanel (QSizeF (contentWidth, contentHeight)); -- mBackground->paintPanel (&p, QRect (0, 0, contentWidth, -+ mBackground->resizeFrame (QSizeF (contentWidth, contentHeight)); -+ mBackground->paintFrame (&p, QRect (0, 0, contentWidth, - contentHeight)); - - mBackgroundPixmap = mPixmap.copy (mBorder.left, mBorder.top, -@@ -168,7 +168,7 @@ - p.setCompositionMode (QPainter::CompositionMode_Source); - - -- mBackground->paintPanel (&p, QRect (mBorder.left, mBorder.top + -+ mBackground->paintFrame (&p, QRect (mBorder.left, mBorder.top + - mGeometry.height () + 5, mGeometry.width (), - fm.height ())); - -diff -ur compiz-0.7.8/kde/window-decorator-kde4/switcher.h compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.h ---- compiz-0.7.8/kde/window-decorator-kde4/switcher.h 2008-08-08 13:20:31.000000000 +0200 -+++ compiz-0.7.8-kde42/kde/window-decorator-kde4/switcher.h 2008-12-01 19:28:37.000000000 +0100 -@@ -30,7 +30,7 @@ - - namespace Plasma - { --class PanelSvg; -+class FrameSvg; - } - - class QSpacerItem; -@@ -70,7 +70,7 @@ - - QRect mGeometry; - -- Plasma::PanelSvg *mBackground; -+ Plasma::FrameSvg *mBackground; - QPixmap mPixmap; - QPixmap mBackgroundPixmap; - diff --git a/source/x/x11/patch/xcursorgen.patch b/source/x/x11/patch/xcursorgen.patch new file mode 100644 index 000000000..5aa46dee5 --- /dev/null +++ b/source/x/x11/patch/xcursorgen.patch @@ -0,0 +1 @@ +zcat $CWD/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff b/source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff new file mode 100644 index 000000000..ad7ae105c --- /dev/null +++ b/source/x/x11/patch/xcursorgen/xcursorgen.png14.configure.kludge.diff @@ -0,0 +1,61 @@ +--- ./configure.orig 2009-10-16 19:42:25.000000000 -0500 ++++ ./configure 2010-02-21 13:57:53.000000000 -0600 +@@ -5043,12 +5043,12 @@ + pkg_cv_XCURSORGEN_CFLAGS="$XCURSORGEN_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng12\"") >&5 +- ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng12") 2>&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng14\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng14") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_XCURSORGEN_CFLAGS=`$PKG_CONFIG --cflags "x11 xcursor libpng12" 2>/dev/null` ++ pkg_cv_XCURSORGEN_CFLAGS=`$PKG_CONFIG --cflags "x11 xcursor libpng14" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -5059,12 +5059,12 @@ + pkg_cv_XCURSORGEN_LIBS="$XCURSORGEN_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng12\"") >&5 +- ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng12") 2>&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng14\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng14") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_XCURSORGEN_LIBS=`$PKG_CONFIG --libs "x11 xcursor libpng12" 2>/dev/null` ++ pkg_cv_XCURSORGEN_LIBS=`$PKG_CONFIG --libs "x11 xcursor libpng14" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -5082,14 +5082,14 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xcursor libpng12" 2>&1` ++ XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xcursor libpng14" 2>&1` + else +- XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xcursor libpng12" 2>&1` ++ XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xcursor libpng14" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$XCURSORGEN_PKG_ERRORS" >&5 + +- { { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xcursor libpng12) were not met: ++ { { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xcursor libpng14) were not met: + + $XCURSORGEN_PKG_ERRORS + +@@ -5100,7 +5100,7 @@ + and XCURSORGEN_LIBS to avoid the need to call pkg-config. + See the pkg-config man page for more details. + " >&5 +-$as_echo "$as_me: error: Package requirements (x11 xcursor libpng12) were not met: ++$as_echo "$as_me: error: Package requirements (x11 xcursor libpng14) were not met: + + $XCURSORGEN_PKG_ERRORS + diff --git a/source/x/x11/patch/xf86-input-synaptics.patch b/source/x/x11/patch/xf86-input-synaptics.patch new file mode 100644 index 000000000..f41034c37 --- /dev/null +++ b/source/x/x11/patch/xf86-input-synaptics.patch @@ -0,0 +1,4 @@ +# Enable tap-to-click out of the box, closing one of the +# most reported bugs of the last 2 years or so. +# Thanks to Piter Punk for figuring out the proper fix! +zcat $CWD/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff b/source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff new file mode 100644 index 000000000..2fdf4e0d1 --- /dev/null +++ b/source/x/x11/patch/xf86-input-synaptics/xf86-input-synaptics.tap-to-click.diff @@ -0,0 +1,11 @@ +--- ./fdi/11-x11-synaptics.fdi.orig 2009-10-11 18:11:21.000000000 -0500 ++++ ./fdi/11-x11-synaptics.fdi 2010-04-24 12:59:37.000000000 -0500 +@@ -3,6 +3,8 @@ + <device> + <match key="info.capabilities" contains="input.touchpad"> + <merge key="input.x11_driver" type="string">synaptics</merge> ++ <!-- Enable tap click by default: --> ++ <merge key="input.x11_options.TapButton1" type="string">1</merge> + <!-- Arbitrary options can be passed to the driver using + the input.x11_options property since xorg-server-1.5. --> + <!-- EXAMPLES: diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch index 41aa4270d..16cf61e36 100644 --- a/source/x/x11/patch/xorg-server.patch +++ b/source/x/x11/patch/xorg-server.patch @@ -1 +1,2 @@ zcat $CWD/patch/xorg-server/x11.startwithblackscreen.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff b/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff new file mode 100644 index 000000000..f8abdccb2 --- /dev/null +++ b/source/x/x11/patch/xorg-server/xorg-server.fb.fbpict.c.mod.diff @@ -0,0 +1,11 @@ +--- ./fb/fbpict.c.orig 2010-03-11 22:38:21.000000000 -0600 ++++ ./fb/fbpict.c 2010-04-29 14:14:52.000000000 -0500 +@@ -37,7 +37,7 @@ + #include "mipict.h" + #include "fbpict.h" + +-#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b)) ++#define mod(a,b) ((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-(a)) % (b)) + + void + fbWalkCompositeRegion (CARD8 op, diff --git a/source/x/x11/patch/xscope.patch b/source/x/x11/patch/xscope.patch deleted file mode 100644 index a41588a0b..000000000 --- a/source/x/x11/patch/xscope.patch +++ /dev/null @@ -1 +0,0 @@ -zcat $CWD/patch/xscope/xscope-1.1-scope.c.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/x/x11/patch/xscope/xscope-1.1-scope.c.diff b/source/x/x11/patch/xscope/xscope-1.1-scope.c.diff deleted file mode 100644 index 2c01dbac2..000000000 --- a/source/x/x11/patch/xscope/xscope-1.1-scope.c.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur xscope-1.1.orig/scope.c xscope-1.1/scope.c ---- xscope-1.1.orig/scope.c 2008-09-22 21:18:16.000000000 -0500 -+++ xscope-1.1/scope.c 2009-04-08 23:54:12.230818270 -0500 -@@ -58,6 +58,7 @@ - #include <errno.h> - #include <unistd.h> - #include <netdb.h> -+#include <linux/param.h> - - #ifdef SYSV - #define bzero(s,l) memset(s, 0, l) |