maj de udev#163-1

8 files changed, 11 insertions, 252 deletions

diff --git a/base/udev/.footprint b/base/udev/.footprint
index 849e80b59..9a76c9d97 100644
--- a/base/udev/.footprint
+++ b/base/udev/.footprint
@@ -5,8 +5,8 @@ drwxr-xr-x	root/root	etc/udev/rules.d/
 -rw-r--r--	root/root	etc/udev/udev.conf
 drwxr-xr-x	root/root	lib/
 drwxr-xr-x	root/root	lib/firmware/
-lrwxrwxrwx	root/root	lib/libudev.so.0 -> libudev.so.0.8.3
--rwxr-xr-x	root/root	lib/libudev.so.0.8.3
+lrwxrwxrwx	root/root	lib/libudev.so.0 -> libudev.so.0.9.1
+-rwxr-xr-x	root/root	lib/libudev.so.0.9.1
 drwxr-xr-x	root/root	lib/udev/
 -rwxr-xr-x	root/root	lib/udev/ata_id
 -rwxr-xr-x	root/root	lib/udev/cdrom_id
@@ -54,14 +54,17 @@ drwxr-xr-x	root/root	lib/udev/keymaps/force-release/
 -rw-r--r--	root/root	lib/udev/keymaps/hewlett-packard-presario-2100
 -rw-r--r--	root/root	lib/udev/keymaps/hewlett-packard-tablet
 -rw-r--r--	root/root	lib/udev/keymaps/hewlett-packard-tx2
+-rw-r--r--	root/root	lib/udev/keymaps/ibm-thinkpad-usb-keyboard-trackpoint
 -rw-r--r--	root/root	lib/udev/keymaps/inventec-symphony_6.0_7.0
 -rw-r--r--	root/root	lib/udev/keymaps/lenovo-3000
+-rw-r--r--	root/root	lib/udev/keymaps/lenovo-ideapad
 -rw-r--r--	root/root	lib/udev/keymaps/lenovo-thinkpad-usb-keyboard-trackpoint
 -rw-r--r--	root/root	lib/udev/keymaps/lenovo-thinkpad_x200_tablet
 -rw-r--r--	root/root	lib/udev/keymaps/lenovo-thinkpad_x6_tablet
 -rw-r--r--	root/root	lib/udev/keymaps/lg-x110
 -rw-r--r--	root/root	lib/udev/keymaps/logitech-wave
 -rw-r--r--	root/root	lib/udev/keymaps/logitech-wave-cordless
+-rw-r--r--	root/root	lib/udev/keymaps/logitech-wave-pro-cordless
 -rw-r--r--	root/root	lib/udev/keymaps/maxdata-pro_7000
 -rw-r--r--	root/root	lib/udev/keymaps/medion-fid2060
 -rw-r--r--	root/root	lib/udev/keymaps/medionnb-a555
@@ -72,6 +75,7 @@ drwxr-xr-x	root/root	lib/udev/keymaps/force-release/
 -rw-r--r--	root/root	lib/udev/keymaps/module-sony
 -rw-r--r--	root/root	lib/udev/keymaps/module-sony-old
 -rw-r--r--	root/root	lib/udev/keymaps/olpc-xo
+-rw-r--r--	root/root	lib/udev/keymaps/onkyo
 -rw-r--r--	root/root	lib/udev/keymaps/oqo-model2
 -rw-r--r--	root/root	lib/udev/keymaps/samsung-other
 -rw-r--r--	root/root	lib/udev/keymaps/samsung-sq1us
@@ -144,7 +148,7 @@ lrwxrwxrwx	root/root	usr/lib/libgudev-1.0.so -> libgudev-1.0.so.0.0.1
 lrwxrwxrwx	root/root	usr/lib/libgudev-1.0.so.0 -> libgudev-1.0.so.0.0.1
 -rwxr-xr-x	root/root	usr/lib/libgudev-1.0.so.0.0.1
 -rwxr-xr-x	root/root	usr/lib/libudev.la
-lrwxrwxrwx	root/root	usr/lib/libudev.so -> ../../lib/libudev.so.0.8.3
+lrwxrwxrwx	root/root	usr/lib/libudev.so -> ../../lib/libudev.so.0.9.1
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gudev-1.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libudev.pc
diff --git a/base/udev/.md5sum b/base/udev/.md5sum
index adaacc325..ea304c804 100644
--- a/base/udev/.md5sum
+++ b/base/udev/.md5sum
@@ -1,2 +1,2 @@
-26f99dde11f8e393d659614d7d1a3964  udev-158.tar.bz2
-a0da4e9b11920f7a7d23f8787e773036  udev-config-20100128.tar.bz2
+8b584982c5548ca0368beeddc5413146  udev-163.tar.bz2
+757afae8e3931cb3f18a7cdd372cd2f8  udev-config-20100128.tar.bz2
diff --git a/base/udev/Pkgfile b/base/udev/Pkgfile
index f6ee027f4..29f0b0718 100644
--- a/base/udev/Pkgfile
+++ b/base/udev/Pkgfile
@@ -2,10 +2,10 @@
 # URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: glib, usbutils, gobject-introspection, gperf, acl, pciutils
+# Depends on: gobject-introspection, libusb, usbutils, acl, gperf, glib, usbutils, gobject-introspection, gperf, acl, pciutils
 
 name=udev
-version=158
+version=163
 release=1
 _lfs_release=20100128
 source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.tar.bz2 \
diff --git a/kde/kdebindings/ruby.patch b/kde/kdebindings/ruby.patch
deleted file mode 100755
index 5276dedcd..000000000
--- a/kde/kdebindings/ruby.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-* Set up a RUBY_VERSION macro to use to test for whether QtRuby is being
-  built for Ruby 1.9 or not. Add patches from Mr Napalm for building 
-with
-  Ruby 1.9, for the new 'per string' encoding. Also add conditional code
-  for whether to use the new rb_frame_callee() function or the old
-  rb_frame_last_func() one.
-
-CCMAIL: kde-bindings@...
-
-
- M  +10 -0     CMakeLists.txt  
- M  +7 -0      qtruby/ChangeLog  
- M  +4 -0      qtruby/src/CMakeLists.txt  
- M  +37 -6     qtruby/src/handlers.cpp  
- M  +0 -1      qtruby/src/marshall_types.cpp  
- M  +4 -0      qtruby/src/qtruby.cpp  
-
-
---- trunk/KDE/kdebindings/ruby/CMakeLists.txt #920196:920197
-@@ -46,6 +46,16 @@
- set(PLASMA_ENABLED "no")
- 
- if(RUBY_EXECUTABLE AND RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
-+   EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -e "print RUBY_VERSION"
-+      OUTPUT_VARIABLE RUBY_VERSION)
-+
-+    STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" 
-RUBY_VERSION_MAJOR "${RUBY_VERSION}")
-+    STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" 
-RUBY_VERSION_MINOR "${RUBY_VERSION}")
-+    STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" 
-RUBY_VERSION_PATCH "${RUBY_VERSION}")
-+
-+    # compute an overall version number which can be compared at once
-+    MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + 
-${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")
-+
-     if(ENABLE_QTRUBY)
-         add_subdirectory( qtruby )
-         set(QTRUBY_ENABLED "yes")
---- trunk/KDE/kdebindings/ruby/qtruby/ChangeLog #920196:920197
-@@ -1,3 +1,10 @@
-+2009-02-02  Richard Dale  <richard.j.dale@...>
-+ * Set up a RUBY_VERSION macro to use to test for whether QtRuby is 
-being
-+  built for Ruby 1.9 or not. Add patches from Mr Napalm for building 
-with
-+  Ruby 1.9, for the new 'per string' encoding. Also add conditional 
-code
-+  for whether to use the new rb_frame_callee() function or the old
-+  rb_frame_last_func() one.
-+
- 2009-02-01  Richard Dale  <richard.j.dale@...>
-  * The construct_copy() function was using the full classname of the 
-class
-   to construct which meant that it didn't work with classnames 
-containing
---- trunk/KDE/kdebindings/ruby/qtruby/src/CMakeLists.txt #920196:920197
-@@ -9,6 +9,10 @@
-     ADD_DEFINITIONS (-DQT_QWT)
- ENDIF(QWT_FOUND)
- 
-+if(RUBY_VERSION)
-+    ADD_DEFINITIONS (-DRUBY_VERSION=0x${RUBY_VERSION_NUMBER})
-+ENDIF(RUBY_VERSION)
-+
- include_directories( ${CMAKE_SOURCE_DIR}/smoke ${RUBY_INCLUDE_PATH} )
- INCLUDE_DIRECTORIES (${QT_INCLUDES})
- 
---- trunk/KDE/kdebindings/ruby/qtruby/src/handlers.cpp #920196:920197
-@@ -891,9 +891,11 @@
-  }
- }
- 
--static const char * KCODE = 0;
- static QTextCodec *codec = 0;
- 
-+#if RUBY_VERSION < 0x10900
-+static const char * KCODE = 0;
-+
- static void
- init_codec() {
-  VALUE temp = rb_gv_get("$KCODE");
-@@ -923,11 +925,6 @@
-  return new QString(QString::fromLocal8Bit(StringValuePtr(rstring), 
-RSTRING_LEN(rstring)));
- }
- 
--QByteArray*
--qbytearrayFromRString(VALUE rstring) {
--  return new QByteArray(StringValuePtr(rstring), RSTRING_LEN(rstring));
--}
--
- VALUE
- rstringFromQString(QString * s) {
-  if (KCODE == 0) {
-@@ -946,6 +943,40 @@
-  return rb_str_new2(s->toLocal8Bit());
- }
- 
-+#else
-+
-+QString*
-+qstringFromRString(VALUE rstring) {
-+ VALUE encoding = rb_funcall(rstring, rb_intern("encoding"), 0);
-+ encoding = rb_funcall(encoding, rb_intern("to_s"), 0);
-+ const char * enc_s = RSTRING_PTR(encoding);
-+
-+ if (qstrcmp(enc_s, "UTF8") == 0) {
-+ return new QString(QString::fromUtf8(StringValuePtr(rstring), 
-RSTRING_LEN(rstring)));
-+ } else if (qstrcmp(enc_s, "EUC-JP") == 0) {
-+ codec = QTextCodec::codecForName("eucJP");
-+ return new QString(codec->toUnicode(StringValuePtr(rstring)));
-+ } else if (qstrcmp(enc_s, "Shift-JIS") == 0) {
-+ codec = QTextCodec::codecForName("Shift-JIS");
-+ return new QString(codec->toUnicode(StringValuePtr(rstring)));
-+ } else if(qstrcmp(enc_s, "ISO-8859-1") == 0 || qstrcmp(enc_s, 
-"US-ASCII") == 0) {
-+ return new QString(QString::fromLatin1(StringValuePtr(rstring)));
-+ }
-+
-+ return new QString(QString::fromLocal8Bit(StringValuePtr(rstring), 
-RSTRING_LEN(rstring)));
-+}
-+
-+VALUE
-+rstringFromQString(QString * s) {
-+ return rb_str_new2(s->toUtf8());
-+}
-+#endif
-+
-+QByteArray*
-+qbytearrayFromRString(VALUE rstring) {
-+  return new QByteArray(StringValuePtr(rstring), RSTRING_LEN(rstring));
-+}
-+
- VALUE
- rstringFromQByteArray(QByteArray * s) {
-   return rb_str_new(s->data(), s->size());
---- trunk/KDE/kdebindings/ruby/qtruby/src/marshall_types.cpp 
-#920196:920197
-@@ -17,7 +17,6 @@
-  
-***************************************************************************/
- 
- #include "marshall_types.h"
--#include <rubysig.h>
- #include <smoke/qt_smoke.h>
- #include <QtDBus>
- 
---- trunk/KDE/kdebindings/ruby/qtruby/src/qtruby.cpp #920196:920197
-@@ -1365,7 +1365,11 @@
-  return Qfalse;
-  }
- 
-+#if RUBY_VERSION >= 0x10900
-+ QLatin1String signalname(rb_id2name(rb_frame_callee()));
-+#else
-  QLatin1String signalname(rb_id2name(rb_frame_last_func()));
-+#endif
-  VALUE metaObject_value = rb_funcall(qt_internal_module, 
-rb_intern("getMetaObject"), 2, Qnil, self);
- 
-  smokeruby_object *ometa = value_obj_info(metaObject_value); 
diff --git a/kde/polkit-kde/gcc45.patch b/kde/polkit-kde/gcc45.patch
deleted file mode 100644
index 478b1660c..000000000
--- a/kde/polkit-kde/gcc45.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- agent/AuthDialog.cpp	2010-04-10 10:13:18.634941750 +0200
-+++ agent/AuthDialog.cpp	2010-04-10 10:13:56.021565836 +0200
-@@ -169,7 +169,7 @@
-         foreach(PolkitQt1::Identity *identity, identities) {
-             // First check to see if the user is valid
-             qDebug() << "User: " << identity;
--            KUser user = KUser::KUser(identity->toString().remove("unix-user:"));
-+            KUser user = KUser(identity->toString().remove("unix-user:"));
-             if (!user.isValid()) {
-                 kWarning() << "User invalid: " << user.loginName();
-                 continue;
diff --git a/test/polkit-qt/.footprint b/test/polkit-qt/.footprint
deleted file mode 100644
index 80d7eaadd..000000000
--- a/test/polkit-qt/.footprint
+++ /dev/null
@@ -1,45 +0,0 @@
-drwxr-xr-x	root/root	usr/
-drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/polkit-qt-1/
-drwxr-xr-x	root/root	usr/include/polkit-qt-1/PolkitQt1/
--rw-r--r--	root/root	usr/include/polkit-qt-1/PolkitQt1/ActionDescription
-drwxr-xr-x	root/root	usr/include/polkit-qt-1/PolkitQt1/Agent/
--rw-r--r--	root/root	usr/include/polkit-qt-1/PolkitQt1/Agent/Listener
--rw-r--r--	root/root	usr/include/polkit-qt-1/PolkitQt1/Agent/Session
--rw-r--r--	root/root	usr/include/polkit-qt-1/PolkitQt1/Authority
--rw-r--r--	root/root	usr/include/polkit-qt-1/PolkitQt1/Details
-drwxr-xr-x	root/root	usr/include/polkit-qt-1/PolkitQt1/Gui/
--rw-r--r--	root/root	usr/include/polkit-qt-1/PolkitQt1/Gui/Action
--rw-r--r--	root/root	usr/include/polkit-qt-1/PolkitQt1/Gui/ActionButton
--rw-r--r--	root/root	usr/include/polkit-qt-1/PolkitQt1/Gui/ActionButtons
--rw-r--r--	root/root	usr/include/polkit-qt-1/PolkitQt1/Identity
--rw-r--r--	root/root	usr/include/polkit-qt-1/PolkitQt1/Subject
--rw-r--r--	root/root	usr/include/polkit-qt-1/PolkitQt1/TemporaryAuthorization
--rw-r--r--	root/root	usr/include/polkit-qt-1/polkitqt1-actiondescription.h
--rw-r--r--	root/root	usr/include/polkit-qt-1/polkitqt1-agent-listener.h
--rw-r--r--	root/root	usr/include/polkit-qt-1/polkitqt1-agent-session.h
--rw-r--r--	root/root	usr/include/polkit-qt-1/polkitqt1-authority.h
--rw-r--r--	root/root	usr/include/polkit-qt-1/polkitqt1-details.h
--rw-r--r--	root/root	usr/include/polkit-qt-1/polkitqt1-export.h
--rw-r--r--	root/root	usr/include/polkit-qt-1/polkitqt1-gui-action.h
--rw-r--r--	root/root	usr/include/polkit-qt-1/polkitqt1-gui-actionbutton.h
--rw-r--r--	root/root	usr/include/polkit-qt-1/polkitqt1-gui-actionbuttons.h
--rw-r--r--	root/root	usr/include/polkit-qt-1/polkitqt1-identity.h
--rw-r--r--	root/root	usr/include/polkit-qt-1/polkitqt1-subject.h
--rw-r--r--	root/root	usr/include/polkit-qt-1/polkitqt1-temporaryauthorization.h
--rw-r--r--	root/root	usr/include/polkit-qt-1/polkitqt1-version.h
-drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libpolkit-qt-agent-1.so -> libpolkit-qt-agent-1.so.0
-lrwxrwxrwx	root/root	usr/lib/libpolkit-qt-agent-1.so.0 -> libpolkit-qt-agent-1.so.0.95.1
--rwxr-xr-x	root/root	usr/lib/libpolkit-qt-agent-1.so.0.95.1
-lrwxrwxrwx	root/root	usr/lib/libpolkit-qt-core-1.so -> libpolkit-qt-core-1.so.0
-lrwxrwxrwx	root/root	usr/lib/libpolkit-qt-core-1.so.0 -> libpolkit-qt-core-1.so.0.95.1
--rwxr-xr-x	root/root	usr/lib/libpolkit-qt-core-1.so.0.95.1
-lrwxrwxrwx	root/root	usr/lib/libpolkit-qt-gui-1.so -> libpolkit-qt-gui-1.so.0
-lrwxrwxrwx	root/root	usr/lib/libpolkit-qt-gui-1.so.0 -> libpolkit-qt-gui-1.so.0.95.1
--rwxr-xr-x	root/root	usr/lib/libpolkit-qt-gui-1.so.0.95.1
-drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/polkit-qt-1.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/polkit-qt-agent-1.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/polkit-qt-core-1.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/polkit-qt-gui-1.pc
diff --git a/test/polkit-qt/.md5sum b/test/polkit-qt/.md5sum
deleted file mode 100644
index 8f52285f0..000000000
--- a/test/polkit-qt/.md5sum
+++ /dev/null
@@ -1 +0,0 @@
-b5c5017058ab0f3bc7eb337a7c66e0bc  polkit-qt-1-0.95.1.tar.bz2
diff --git a/test/polkit-qt/Pkgfile b/test/polkit-qt/Pkgfile
deleted file mode 100755
index 0b7c75832..000000000
--- a/test/polkit-qt/Pkgfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Description: Librairie permettant aux dévelopeurs d'accéder à l'API policyKit via qt
-# URL: http://www.kde.org
-# Maintainer: NuTyX packager team
-# Packager: lesibel at free dot fr
-# Depends on: polkit, qt, cmake, automoc4
-
-name=polkit-qt
-version=0.95.1
-release=1
-source=(ftp://ftp.kde.org/pub/kde/stable/$name-1/$name-1-$version.tar.bz2)
-
-build() {
-	cd $SRC
-	mkdir build
-	cd build
-	cmake ../$name-1-$version \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON
-	make
-	make DESTDIR=$PKG install
-}
-