packages (DEVEL): qt4/qt4.spec, qt4/qt4-kde-git.patch - updated kde-qt patch
cactus
cactus at pld-linux.org
Wed Nov 25 20:50:24 CET 2009
Author: cactus Date: Wed Nov 25 19:50:24 2009 GMT
Module: packages Tag: DEVEL
---- Log message:
- updated kde-qt patch
---- Files affected:
packages/qt4:
qt4.spec (1.226.2.11 -> 1.226.2.12) , qt4-kde-git.patch (1.1.2.1 -> 1.1.2.2)
---- Diffs:
================================================================
Index: packages/qt4/qt4.spec
diff -u packages/qt4/qt4.spec:1.226.2.11 packages/qt4/qt4.spec:1.226.2.12
--- packages/qt4/qt4.spec:1.226.2.11 Wed Nov 18 10:56:44 2009
+++ packages/qt4/qt4.spec Wed Nov 25 20:50:18 2009
@@ -1355,7 +1355,7 @@
%prep
%setup -q -n qt-everywhere-opensource-src-%{version}-%{state}
-#%patch100 -p1
+%patch100 -p1
%patch0 -p1
%patch1 -p0
@@ -2257,6 +2257,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.226.2.12 2009/11/25 19:50:18 cactus
+- updated kde-qt patch
+
Revision 1.226.2.11 2009/11/18 09:56:44 paszczus
- updated to 4.6.0 rc1
================================================================
Index: packages/qt4/qt4-kde-git.patch
diff -u packages/qt4/qt4-kde-git.patch:1.1.2.1 packages/qt4/qt4-kde-git.patch:1.1.2.2
--- packages/qt4/qt4-kde-git.patch:1.1.2.1 Sun Oct 18 01:57:03 2009
+++ packages/qt4/qt4-kde-git.patch Wed Nov 25 20:50:18 2009
@@ -1,8 +1,215 @@
+diff --git a/README.kde-qt b/README.kde-qt
+new file mode 100644
+index 0000000..db3feb6
+--- /dev/null
++++ b/README.kde-qt
+@@ -0,0 +1,201 @@
++This is a patched version of Qt. It may include changes made by KDE
++and Qt developers that have either not been accepted for inclusion
++into Qt, or have been accepted for a later version of Qt than this
++one.
++
++1. Configuring Qt
++=================
++
++The recommended compile line is:
++
++--default-config-begin--
++
++ ./configure -qt-gif -debug -fast -no-separate-debug-info \
++ -system-libpng -system-libjpeg -system-zlib \
++ -dbus -webkit -plugin-sql-mysql \
++ -nomake examples -nomake demos -prefix <installdir>
++
++--default-config-end--
++
++It contains "-debug", which greatly improves the use for backtraces (but
++also needs a lot more disk space and makes things slower). To build in
++release mode, replace it with "-release".
++
++It also contains "-no-separate-debug-info", which disables separate .debug
++files. Instead, the debug information will be built into the libraries.
++This option is needed when you install Qt.
++
++If you don't install Qt, it can be useful to disable this option,
++thus having separate debug symbol files. With separate debug files, you can
++just move those debug files to another directory to remove Qt debug symbols.
++Moving the files back will enable Qt debug symbols again.
++This is useful if you rarely need to step into Qt functions during debugging,
++because GDB loads much faster and uses less memory without Qt debug symbols.
++In the rare case you need to step into Qt code, you can temporarily enable
++debug symbols again by moving the debug files back. You can even load the Qt
++debug symbols from within GDB on demand, using the "symbol-file" command.
++
++If you are planning to compile Qt using an Icecream cluster you have to
++pass the option -no-pch (no precompiled headers) to configure to make
++distributed compilation work.
++
++2. Compiling Qt
++===============
++
++To compile Qt on a Unix platform, run:
++
++ export MAKEFLAGS=-j2
++ make
++ make install
++
++If your computer has more than one core or processor, you may consider
++increasing the "2" above. If you've got a compile farm available, you
++should adjust the -j argument to match the number of slots in that
++farm.
++
++3. Modifying & rebuilding Qt
++============================
++
++If you make modifications to the Qt source code, you don't need to
++build everything again. Simply go to the directory containing the
++Makefile closest to the files you changed and run "make" again.
++
++For example, if you've modified src/corelib/io/qiodevice.cpp, do:
++
++ cd src/corelib
++ make
++
++If you make a change that is not temporary, you should create a Git
++commit out of it. However, you shouldn't push those changes to
++kde-qt.git. If you have a fix that benefit others, see the "Creating
++kde-qt.git modifications" section below.
++
++4. Building Qt examples and demos
++=================================
++
++The "-nomake examples -nomake demos" arguments to the configure script
++mean that those two sections will not be configured for building,
++which is unneeded for usage of the library. If you want to compile
++the examples or demos later, just enter either directory and type:
++
++ qmake
++ make
++
++5. Build Qt tests
++=================
++
++(Official information: http://qt.gitorious.org/qt/pages/QtAutotestsEnvironment)
++
++In order to run Qt tests, you must have a "developer build" of Qt. For
++that, you need to reconfigure Qt and add the "-developer-build"
++option. That option is technically equivalent to the options:
++
++ -debug -prefix $PWD -DQT_BUILD_INTERNAL
++
++To run a test, go to its source dir in tests/auto/testname. Type
++"make" to build it, then run it (either ./tst_testname, or "make install").
++
++6. Building Qt documentation
++============================
++
++To build and install the documentation, run:
++
++ make docs
++ ./config.status
++ make install
++
++It is necessary to do this once only, even if you rebuild Qt later.
++
++7. Using Qt uninstalled
++=======================
++
++To use without having to install it, configure it as follows:
++
++ ./configure <other configure options> -prefix $PWD
++ make sub-src
++ make sub-tools
++
++Attention: DO NOT run
++
++ make install
++
++If you do, Qt will overwrite your include/ directory with its
++installation.
++
++8. Creating kde-qt.git modifications
++====================================
++
++If you have fixed a bug in Qt or modified it in any way that may
++benefit others, please share your change in the form of a patch. Do
++not commit your changes directly to the main branch because they
++may be lost in a future update if they have not been added to the
++official Qt release.
++
++The exception to the above rule is that if the fix has been accepted
++by Qt Software (and so will appear in the very next release of Qt),
++then it should be simply cherry-picked from the Qt development
++branch. Note that you shouldn't do this for changes that have been
++accepted into a release which is not the very next.
++In this case, you should use the following command:
++
++ git cherry-pick -x SHA1_OF_THE_FIX
++where SHA1_OF_THE_FIX is the SHA-1 of the commit that you want to
++introduce. Then push the change to the server.
++
++Before creating a patch, it is recommended to contact Qt Software
++support via qt-bugs at trolltech.com and explain the situation. There may
++be a solution for the problem already or a new direction that should
++be accounted for.
++
++To create a patch, do the following:
++ a) look at the listing of branches in
++ http://qt.gitorious.org/+kde-developers/qt/kde-qt/commits/HEAD and
++ select the next number.
++
++ b) create a new branch out of a clean, released version of Qt, (for
++ example, 4.5.1), using the number above and a brief description of
++ your fix. For example:
++ git checkout -b patches/0180-window-role v4.5.1
++ You can see the available released versions of Qt with:
++ git tag
++
++ c) make your changes to the Qt source code and verify that it
++ compiles, links and works (please run the respective unit tests).
++
++ c) commit your changes to Git, using the "git commit" command. Please
++ see http://qt.gitorious.org/qt/pages/GitIntroductionWithQt and
++ http://qt.gitorious.org/qt/pages/QtCodingStyle for information on
++ how to create commits
++ Note that you can create multiple commits.
++
++ e) merge the change to the main branch, for example, 4.5.1-patched:
++ git checkout 4.5.1-patched
++ git merge patches/0180-window-role
++
++ f) push the changes you made to your branch and to the main server:
++ git push git at gitorious.org:qt/kde-qt.git 4.5.1-patched patches/0180-window-role
++ (Don't forget to list both branch names)
++
++Don't forget to submit your patch to using the Qt Contribution Model,
++along with the long description of the issue found. See
++http://qt.gitorious.org/qt/pages/QtContributionGuidelines for
++information how. You can submit the branch you've just sent to the
++server.
++
++9. Troubleshooting: Re-configuring and re-compiling
++==================================================
++
++For those updating the source in a directory where Qt has already
++been compiled, you may need to run the following commands from the
++top directory of your Qt sources:
++
++ find . -name '*.moc' | xargs rm
++
++Sometimes ./configure will refuse to run. You may need to:
++ rm .qmake.cache
++
++If you think you may have run "make install" on an install-less Qt
++(srcdir == $QTDIR), run:
++
++ rm -rf include
++ bin/syncqt
diff --git a/bin/syncqt b/bin/syncqt
-index 6605bfa..8eb43b8 100755
+index a14a82d..ac140eb 100755
--- a/bin/syncqt
+++ b/bin/syncqt
-@@ -365,9 +365,13 @@ sub fixPaths {
+@@ -366,9 +366,13 @@ sub fixPaths {
$match_dir = $tmp;
$i = $slash;
}
@@ -18,10 +225,10 @@
for(my $i = 0; $i < $count; $i++) {
$dots .= "../";
diff --git a/configure b/configure
-index ea50b37..dbf1b5a 100755
+index b6ce9e6..6c69378 100755
--- a/configure
+++ b/configure
-@@ -1020,6 +1020,11 @@ while [ "$#" -gt 0 ]; do
+@@ -1022,6 +1022,11 @@ while [ "$#" -gt 0 ]; do
VAL=`echo $1 | sed 's,-D,,'`
fi
;;
@@ -33,7 +240,7 @@
-I?*|-I)
VAR="add_ipath"
if [ "$1" = "-I" ]; then
-@@ -2017,6 +2022,9 @@ while [ "$#" -gt 0 ]; do
+@@ -2030,6 +2035,9 @@ while [ "$#" -gt 0 ]; do
add_ipath)
I_FLAGS="$I_FLAGS -I\"${VAL}\""
;;
@@ -44,7 +251,7 @@
L_FLAGS="$L_FLAGS -L\"${VAL}\""
;;
diff --git a/projects.pro b/projects.pro
-index 2a6a956..c442bed 100644
+index aa1eb71..8ae64c2 100644
--- a/projects.pro
+++ b/projects.pro
@@ -149,6 +149,9 @@ unix {
@@ -115,149 +322,11 @@
if(!ok) {
QString version = qmake_version();
if(slash != -1) {
-diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
-index eea7532..9aef3a4 100644
---- a/src/corelib/global/qnamespace.h
-+++ b/src/corelib/global/qnamespace.h
-@@ -913,12 +913,10 @@ public:
- Key_Dead_Horn = 0x01001262,
-
- // multimedia/internet keys - ignored by default - see QKeyEvent c'tor
--
- Key_Back = 0x01000061,
- Key_Forward = 0x01000062,
- Key_Stop = 0x01000063,
- Key_Refresh = 0x01000064,
--
- Key_VolumeDown = 0x01000070,
- Key_VolumeMute = 0x01000071,
- Key_VolumeUp = 0x01000072,
-@@ -927,7 +925,6 @@ public:
- Key_BassDown = 0x01000075,
- Key_TrebleUp = 0x01000076,
- Key_TrebleDown = 0x01000077,
--
- Key_MediaPlay = 0x01000080,
- Key_MediaStop = 0x01000081,
- Key_MediaPrevious = 0x01000082,
-@@ -936,13 +933,11 @@ public:
- #endif
- Key_MediaNext = 0x01000083,
- Key_MediaRecord = 0x01000084,
--
- Key_HomePage = 0x01000090,
- Key_Favorites = 0x01000091,
- Key_Search = 0x01000092,
- Key_Standby = 0x01000093,
- Key_OpenUrl = 0x01000094,
--
- Key_LaunchMail = 0x010000a0,
- Key_LaunchMedia = 0x010000a1,
- Key_Launch0 = 0x010000a2,
-@@ -961,6 +956,98 @@ public:
- Key_LaunchD = 0x010000af,
- Key_LaunchE = 0x010000b0,
- Key_LaunchF = 0x010000b1,
-+ Key_MonBrightnessUp = 0x010000b2,
-+ Key_MonBrightnessDown = 0x010000b3,
-+ Key_KeyboardLightOnOff = 0x010000b4,
-+ Key_KeyboardBrightnessUp = 0x010000b5,
-+ Key_KeyboardBrightnessDown = 0x010000b6,
-+ Key_PowerOff = 0x010000b7,
-+ Key_WakeUp = 0x010000b8,
-+ Key_Eject = 0x010000b9,
-+ Key_ScreenSaver = 0x010000ba,
-+ Key_WWW = 0x010000bb,
-+ Key_Memo = 0x010000bc,
-+ Key_LightBulb = 0x010000bd,
-+ Key_Shop = 0x010000be,
-+ Key_History = 0x010000bf,
-+ Key_AddFavorite = 0x010000c0,
-+ Key_HotLinks = 0x010000c1,
-+ Key_BrightnessAdjust = 0x010000c2,
-+ Key_Finance = 0x010000c3,
-+ Key_Community = 0x010000c4,
-+ Key_AudioRewind = 0x010000c5,
-+ Key_BackForward = 0x010000c6,
-+ Key_ApplicationLeft = 0x010000c7,
-+ Key_ApplicationRight = 0x010000c8,
-+ Key_Book = 0x010000c9,
-+ Key_CD = 0x010000ca,
-+ Key_Calculator = 0x010000cb,
-+ Key_ToDoList = 0x010000cc,
-+ Key_ClearGrab = 0x010000cd,
-+ Key_Close = 0x010000ce,
-+ Key_Copy = 0x010000cf,
-+ Key_Cut = 0x010000d0,
-+ Key_Display = 0x010000d1,
-+ Key_DOS = 0x010000d2,
-+ Key_Documents = 0x010000d3,
-+ Key_Excel = 0x010000d4,
-+ Key_Explorer = 0x010000d5,
-+ Key_Game = 0x010000d6,
-+ Key_Go = 0x010000d7,
-+ Key_iTouch = 0x010000d8,
-+ Key_LogOff = 0x010000d9,
-+ Key_Market = 0x010000da,
-+ Key_Meeting = 0x010000db,
-+ Key_MenuKB = 0x010000dc,
-+ Key_MenuPB = 0x010000dd,
-+ Key_MySites = 0x010000de,
-+ Key_News = 0x010000df,
-+ Key_OfficeHome = 0x010000e0,
-+ Key_Option = 0x010000e1,
-+ Key_Paste = 0x010000e2,
-+ Key_Phone = 0x010000e3,
-+ Key_Calendar = 0x010000e4,
-+ Key_Reply = 0x010000e5,
-+ Key_Reload = 0x010000e6,
-+ Key_RotateWindows = 0x010000e7,
-+ Key_RotationPB = 0x010000e8,
-+ Key_RotationKB = 0x010000e9,
-+ Key_Save = 0x010000ea,
-+ Key_Send = 0x010000eb,
-+ Key_Spell = 0x010000ec,
-+ Key_SplitScreen = 0x010000ed,
-+ Key_Support = 0x010000ee,
-+ Key_TaskPane = 0x010000ef,
-+ Key_Terminal = 0x010000f0,
-+ Key_Tools = 0x010000f1,
-+ Key_Travel = 0x010000f2,
-+ Key_Video = 0x010000f3,
-+ Key_Word = 0x010000f4,
-+ Key_Xfer = 0x010000f5,
-+ Key_ZoomIn = 0x010000f6,
-+ Key_ZoomOut = 0x010000f7,
-+ Key_Away = 0x010000f8,
-+ Key_Messenger = 0x010000f9,
-+ Key_WebCam = 0x010000fa,
-+ Key_MailForward = 0x010000fb,
-+ Key_Pictures = 0x010000fc,
-+ Key_Music = 0x010000fd,
-+ Key_Battery = 0x010000fe,
-+ Key_Bluetooth = 0x010000ff,
-+ Key_WLAN = 0x01000100,
-+ Key_UWB = 0x01000101,
-+ Key_AudioForward = 0x01000102,
-+ Key_AudioRepeat = 0x01000103,
-+ Key_AudioRandomPlay = 0x01000104,
-+ Key_Subtitle = 0x01000105,
-+ Key_AudioCycleTrack = 0x01000106,
-+ Key_Time = 0x01000107,
-+ Key_Hibernate = 0x01000108,
-+ Key_View = 0x01000109,
-+ Key_TopMenu = 0x0100010a,
-+ Key_PowerDown = 0x0100010b,
-+ Key_Suspend = 0x0100010c,
-+ Key_ContrastAdjust = 0x0100010d,
-
- Key_MediaLast = 0x0100ffff,
-
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
-index a8120cf..d1cb510 100644
+index 1260d47..5984770 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
-@@ -1122,8 +1122,16 @@ void QObject::setObjectName(const QString &name)
+@@ -1124,8 +1124,16 @@ void QObject::setObjectName(const QString &name)
{
Q_D(QObject);
d->objectName = name;
@@ -299,575 +368,11 @@
static Sender *setCurrentSender(QObject *receiver,
Sender *sender);
-diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
-index 88faea8..3390693 100644
---- a/src/gui/image/qnativeimage.cpp
-+++ b/src/gui/image/qnativeimage.cpp
-@@ -148,7 +148,7 @@ QImage::Format QNativeImage::systemFormat()
- #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
-
- QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* isTextBuffer */, QWidget *widget)
-- : xshmimg(0), xshmpm(0)
-+ : xshmimg(0)
- {
- if (!X11->use_mitshm) {
- image = QImage(width, height, format);
-@@ -199,11 +199,6 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /*
- shmctl(xshminfo.shmid, IPC_RMID, 0);
- return;
- }
-- xshmpm = XShmCreatePixmap(X11->display, DefaultRootWindow(X11->display), xshmimg->data,
-- &xshminfo, width, height, dd);
-- if (!xshmpm) {
-- qWarning() << "QNativeImage: Unable to create shared Pixmap.";
-- }
- }
-
-
-@@ -212,10 +207,6 @@ QNativeImage::~QNativeImage()
- if (!xshmimg)
- return;
-
-- if (xshmpm) {
-- XFreePixmap(X11->display, xshmpm);
-- xshmpm = 0;
-- }
- XShmDetach(X11->display, &xshminfo);
- xshmimg->data = 0;
- XDestroyImage(xshmimg);
-diff --git a/src/gui/image/qnativeimage_p.h b/src/gui/image/qnativeimage_p.h
-index 5b32c28..58b7ae4 100644
---- a/src/gui/image/qnativeimage_p.h
-+++ b/src/gui/image/qnativeimage_p.h
-@@ -90,7 +90,6 @@ public:
-
- #elif defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
- XImage *xshmimg;
-- Pixmap xshmpm;
- XShmSegmentInfo xshminfo;
-
- #elif defined(Q_WS_MAC)
-diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
-index e46a370..90df6bf 100644
---- a/src/gui/kernel/qapplication_x11.cpp
-+++ b/src/gui/kernel/qapplication_x11.cpp
-@@ -1918,7 +1918,7 @@ void qt_init(QApplicationPrivate *priv, int,
- bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0;
- if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0)) {
- Visual *defaultVisual = DefaultVisual(X11->display, DefaultScreen(X11->display));
-- X11->use_mitshm = mitshm_pixmaps && ((defaultVisual->red_mask == 0xff0000
-+ X11->use_mitshm = ((defaultVisual->red_mask == 0xff0000
- || defaultVisual->red_mask == 0xf800)
- && (defaultVisual->green_mask == 0xff00
- || defaultVisual->green_mask == 0x7e0)
-diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
-index 0ce77fe..8164589 100644
---- a/src/gui/kernel/qkeymapper_x11.cpp
-+++ b/src/gui/kernel/qkeymapper_x11.cpp
-@@ -714,47 +714,144 @@ extern bool qt_sm_blockUserInput;
- #define XK_KP_Delete 0xFF9F
- #endif
-
--// the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special
-+// the next lines are taken on 10/2009 from X.org (X11/XF86keysym.h), defining some special
- // multimedia keys. They are included here as not every system has them.
--#define XF86XK_Standby 0x1008FF10
--#define XF86XK_AudioLowerVolume 0x1008FF11
--#define XF86XK_AudioMute 0x1008FF12
--#define XF86XK_AudioRaiseVolume 0x1008FF13
--#define XF86XK_AudioPlay 0x1008FF14
--#define XF86XK_AudioStop 0x1008FF15
--#define XF86XK_AudioPrev 0x1008FF16
--#define XF86XK_AudioNext 0x1008FF17
--#define XF86XK_HomePage 0x1008FF18
--#define XF86XK_Calculator 0x1008FF1D
--#define XF86XK_Mail 0x1008FF19
--#define XF86XK_Start 0x1008FF1A
--#define XF86XK_Search 0x1008FF1B
--#define XF86XK_AudioRecord 0x1008FF1C
--#define XF86XK_Back 0x1008FF26
--#define XF86XK_Forward 0x1008FF27
--#define XF86XK_Stop 0x1008FF28
--#define XF86XK_Refresh 0x1008FF29
--#define XF86XK_Favorites 0x1008FF30
--#define XF86XK_AudioPause 0x1008FF31
--#define XF86XK_AudioMedia 0x1008FF32
--#define XF86XK_MyComputer 0x1008FF33
--#define XF86XK_OpenURL 0x1008FF38
--#define XF86XK_Launch0 0x1008FF40
--#define XF86XK_Launch1 0x1008FF41
--#define XF86XK_Launch2 0x1008FF42
--#define XF86XK_Launch3 0x1008FF43
--#define XF86XK_Launch4 0x1008FF44
--#define XF86XK_Launch5 0x1008FF45
--#define XF86XK_Launch6 0x1008FF46
--#define XF86XK_Launch7 0x1008FF47
--#define XF86XK_Launch8 0x1008FF48
--#define XF86XK_Launch9 0x1008FF49
--#define XF86XK_LaunchA 0x1008FF4A
--#define XF86XK_LaunchB 0x1008FF4B
--#define XF86XK_LaunchC 0x1008FF4C
--#define XF86XK_LaunchD 0x1008FF4D
--#define XF86XK_LaunchE 0x1008FF4E
--#define XF86XK_LaunchF 0x1008FF4F
-+#define XF86XK_MonBrightnessUp 0x1008FF02
-+#define XF86XK_MonBrightnessDown 0x1008FF03
-+#define XF86XK_KbdLightOnOff 0x1008FF04
-+#define XF86XK_KbdBrightnessUp 0x1008FF05
-+#define XF86XK_KbdBrightnessDown 0x1008FF06
-+#define XF86XK_Standby 0x1008FF10
-+#define XF86XK_AudioLowerVolume 0x1008FF11
-+#define XF86XK_AudioMute 0x1008FF12
-+#define XF86XK_AudioRaiseVolume 0x1008FF13
-+#define XF86XK_AudioPlay 0x1008FF14
-+#define XF86XK_AudioStop 0x1008FF15
-+#define XF86XK_AudioPrev 0x1008FF16
-+#define XF86XK_AudioNext 0x1008FF17
-+#define XF86XK_HomePage 0x1008FF18
-+#define XF86XK_Mail 0x1008FF19
-+#define XF86XK_Start 0x1008FF1A
-+#define XF86XK_Search 0x1008FF1B
-+#define XF86XK_AudioRecord 0x1008FF1C
-+#define XF86XK_Calculator 0x1008FF1D
-+#define XF86XK_Memo 0x1008FF1E
-+#define XF86XK_ToDoList 0x1008FF1F
-+#define XF86XK_Calendar 0x1008FF20
-+#define XF86XK_PowerDown 0x1008FF21
-+#define XF86XK_ContrastAdjust 0x1008FF22
-+#define XF86XK_Back 0x1008FF26
-+#define XF86XK_Forward 0x1008FF27
-+#define XF86XK_Stop 0x1008FF28
-+#define XF86XK_Refresh 0x1008FF29
-+#define XF86XK_PowerOff 0x1008FF2A
-+#define XF86XK_WakeUp 0x1008FF2B
-+#define XF86XK_Eject 0x1008FF2C
-+#define XF86XK_ScreenSaver 0x1008FF2D
-+#define XF86XK_WWW 0x1008FF2E
-+#define XF86XK_Sleep 0x1008FF2F
-+#define XF86XK_Favorites 0x1008FF30
-+#define XF86XK_AudioPause 0x1008FF31
-+#define XF86XK_AudioMedia 0x1008FF32
-+#define XF86XK_MyComputer 0x1008FF33
-+#define XF86XK_LightBulb 0x1008FF35
-+#define XF86XK_Shop 0x1008FF36
-+#define XF86XK_History 0x1008FF37
-+#define XF86XK_OpenURL 0x1008FF38
-+#define XF86XK_AddFavorite 0x1008FF39
-+#define XF86XK_HotLinks 0x1008FF3A
-+#define XF86XK_BrightnessAdjust 0x1008FF3B
-+#define XF86XK_Finance 0x1008FF3C
-+#define XF86XK_Community 0x1008FF3D
-+#define XF86XK_AudioRewind 0x1008FF3E
-+#define XF86XK_BackForward 0x1008FF3F
-+#define XF86XK_Launch0 0x1008FF40
-+#define XF86XK_Launch1 0x1008FF41
-+#define XF86XK_Launch2 0x1008FF42
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4.spec?r1=1.226.2.11&r2=1.226.2.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qt4/qt4-kde-git.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
More information about the pld-cvs-commit
mailing list