summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/ethtool/PKGBUILD6
-rw-r--r--extra/libpng/PKGBUILD10
-rw-r--r--extra/libtorrent-rasterbar/PKGBUILD6
-rw-r--r--extra/msmtp/PKGBUILD6
-rw-r--r--extra/postgresql/PKGBUILD22
-rw-r--r--extra/postgresql/postgresql-run-socket.patch12
-rw-r--r--extra/postgresql/postgresql.install4
-rw-r--r--extra/postgresql/postgresql.tmpfiles.conf1
-rw-r--r--extra/transmission/PKGBUILD14
-rw-r--r--extra/transmission/transmission-cli.install4
-rw-r--r--extra/usbview/PKGBUILD37
-rw-r--r--extra/usbview/usbview-1.1-gtk3-port.patch802
-rw-r--r--extra/usbview/usbview-1.1-missing-usbfs.patch11
-rw-r--r--extra/usbview/usbview.install11
-rw-r--r--extra/vim/PKGBUILD18
-rw-r--r--extra/vlc/PKGBUILD12
-rw-r--r--extra/xf86-video-intel/PKGBUILD6
-rw-r--r--extra/xf86-video-nv/PKGBUILD9
-rw-r--r--extra/zeitgeist/PKGBUILD19
19 files changed, 941 insertions, 69 deletions
diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD
index a0328043a..b422b8403 100644
--- a/extra/ethtool/PKGBUILD
+++ b/extra/ethtool/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165653 2012-08-28 08:48:01Z ibiru $
+# $Id: PKGBUILD 169444 2012-10-21 10:28:57Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Paul Mattal <paul@archlinux.org>
# Contributor: Martin Kemp <mdkemp@elys.com>
pkgname=ethtool
-pkgver=3.5
+pkgver=3.6
pkgrel=1
epoch=1
pkgdesc="Utility for controlling network drivers and hardware"
@@ -13,7 +13,7 @@ url="http://www.kernel.org/pub/software/network/ethtool/"
license=('GPL')
depends=('glibc')
source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('021b5785f65637a04d65c2d44d6c2250')
+md5sums=('b897aa2e7eeafb5d69a571b48a1b354f')
build() {
cd $pkgname-$pkgver
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index fad0f3a75..cf7b93bd6 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 164030 2012-07-24 16:52:28Z ibiru $
+# $Id: PKGBUILD 169446 2012-10-21 10:49:41Z ibiru $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
# Contributor: Travis Willard <travis@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=libpng
-pkgver=1.5.12
-_apngver=1.5.12
+pkgver=1.5.13
+_apngver=1.5.13
pkgrel=1
pkgdesc="A collection of routines used to create PNG format graphics files"
arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ depends=('zlib' 'sh')
options=('!libtool')
source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz"
"http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz")
-md5sums=('0fd51add1da6a0e470e0c726c59171b9'
- '7f2924b1fe0cca9080e18b8720443716')
+md5sums=('0b607a685da977f1bfc96e1c47055183'
+ '23c8765aa6ca188c0575386d5ea8fe70')
build() {
cd $pkgname-$pkgver
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index de1b90f06..ddf0e8d0c 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165655 2012-08-28 09:42:38Z ibiru $
+# $Id: PKGBUILD 169448 2012-10-21 11:01:54Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
pkgname=libtorrent-rasterbar
-pkgver=0.16.3
+pkgver=0.16.4
pkgrel=1
epoch=1
pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
@@ -14,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2')
makedepends=('boost')
options=('!libtool' '!emptydirs')
source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('72788037bdf6a0a4796b4d74e543528cbfe9899b')
+sha1sums=('f8695373c574a6801b4dfe7030e0a0c4bb610abd')
build() {
cd $pkgname-$pkgver
diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD
index 1131f7885..83e5fa89a 100644
--- a/extra/msmtp/PKGBUILD
+++ b/extra/msmtp/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 166148 2012-09-04 22:30:41Z eric $
+# $Id: PKGBUILD 169483 2012-10-22 00:13:27Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgbase=msmtp
pkgname=('msmtp' 'msmtp-mta')
-pkgver=1.4.29
+pkgver=1.4.30
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL3')
url="http://msmtp.sourceforge.net"
makedepends=('texlive-core' 'gsasl' 'libgnome-keyring')
source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgbase}-${pkgver}.tar.bz2)
-sha1sums=('6db88d6c5093b3958b0285b5010f2677b05e0348')
+sha1sums=('fd469bae0c3394b30b771780e62bbd41c4d5d175')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD
index 3813f64e2..212415bf2 100644
--- a/extra/postgresql/PKGBUILD
+++ b/extra/postgresql/PKGBUILD
@@ -1,39 +1,47 @@
-# $Id: PKGBUILD 166983 2012-09-24 14:35:11Z dan $
+# $Id: PKGBUILD 169465 2012-10-21 16:43:35Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgbase=postgresql
pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
pkgver=9.2.1
_majorver=${pkgver%.*}
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url="http://www.postgresql.org/"
license=('custom:PostgreSQL')
makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0')
source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
+ postgresql-run-socket.patch
postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate
- postgresql.service postgresql-check-db-dir)
+ postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir)
md5sums=('c0b4799ea9850eae3ead14f0a60e9418'
+ '75c579eed03ffb2312631f0b649175b4'
'1ddd1df8010549f237e7983bb326025e'
'a54d09a20ab1672adf08f037df188d53'
'96f82c38f3f540b53f3e5144900acf17'
'd28e443f9f65a5712c52018b84e27137'
'89b48774b0dae7c37fbb0e907c3c1db8'
+ 'd34e4ab6d589aa819a1e2829290a3b7c'
'505e0e4abfc746cae9558584d471a03c')
sha256sums=('db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461'
+ '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
'9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45'
'3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81'
'57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
'6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
'c69b614731fdd3f4e127540814f5999f423363523c5209e252e19b1d4362ad68'
+ 'd25980980b4c747a1a49d8d4736d8440a77fb8bc3275dbdc3dc6c4cf4ae8de07'
'3a3279d290f556bf7a362670e32b491794f47ed218f6b8c6acef366a3291f669')
build() {
cd "${srcdir}/postgresql-${pkgver}"
+ patch -Np1 < ../postgresql-run-socket.patch
+
./configure --prefix=/usr \
--mandir=/usr/share/man \
--datadir=/usr/share/postgresql \
+ --sysconfdir=/etc \
--with-krb5 \
--with-libxml \
--with-openssl \
@@ -137,18 +145,20 @@ package_postgresql() {
# install launch script
install -D -m755 "${srcdir}/postgresql.rcd" "${pkgdir}/etc/rc.d/postgresql"
+ install -D -m644 "${srcdir}/postgresql.tmpfiles.conf" \
+ "${pkgdir}/usr/lib/tmpfiles.d/postgresql.conf"
install -D -m644 "${srcdir}/postgresql.service" \
"${pkgdir}/usr/lib/systemd/system/postgresql.service"
install -D -m755 "${srcdir}/postgresql-check-db-dir" \
"${pkgdir}/usr/bin/postgresql-check-db-dir"
# install conf file
- install -D -m644 ${srcdir}/postgresql.confd \
+ install -D -m644 "${srcdir}/postgresql.confd" \
"${pkgdir}/etc/conf.d/postgresql"
- install -D -m644 ${srcdir}/postgresql.pam \
+ install -D -m644 "${srcdir}/postgresql.pam" \
"${pkgdir}/etc/pam.d/postgresql"
- install -D -m644 ${srcdir}/postgresql.logrotate \
+ install -D -m644 "${srcdir}/postgresql.logrotate" \
"${pkgdir}/etc/logrotate.d/postgresql"
}
diff --git a/extra/postgresql/postgresql-run-socket.patch b/extra/postgresql/postgresql-run-socket.patch
new file mode 100644
index 000000000..b558c7b74
--- /dev/null
+++ b/extra/postgresql/postgresql-run-socket.patch
@@ -0,0 +1,12 @@
+diff -Naur postgresql-9.2.0.sockets/src/include/pg_config_manual.h postgresql-9.2.0/src/include/pg_config_manual.h
+--- postgresql-9.2.0.sockets/src/include/pg_config_manual.h 2012-09-06 17:26:17.000000000 -0400
++++ postgresql-9.2.0/src/include/pg_config_manual.h 2012-09-06 18:13:18.183092471 -0400
+@@ -144,7 +144,7 @@
+ * here's where to twiddle it. You can also override this at runtime
+ * with the postmaster's -k switch.
+ */
+-#define DEFAULT_PGSOCKET_DIR "/tmp"
++#define DEFAULT_PGSOCKET_DIR "/run/postgresql"
+
+ /*
+ * The random() function is expected to yield values between 0 and
diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install
index 7b73f6fa9..263bccb25 100644
--- a/extra/postgresql/postgresql.install
+++ b/extra/postgresql/postgresql.install
@@ -18,6 +18,10 @@ post_upgrade() {
if [ "$postgres_shell" = "/sbin/nologin" ]; then
chsh -s /bin/bash postgres
fi
+ if [ $(vercmp $2 '9.2.1-2') -lt 0 ]; then
+ echo "Note: The Unix domain socket location has changed; be sure to"
+ echo " restart any local applications using libpq.so."
+ fi
}
post_remove() {
diff --git a/extra/postgresql/postgresql.tmpfiles.conf b/extra/postgresql/postgresql.tmpfiles.conf
new file mode 100644
index 000000000..6c48e34ed
--- /dev/null
+++ b/extra/postgresql/postgresql.tmpfiles.conf
@@ -0,0 +1 @@
+d /run/postgresql 0755 postgres postgres -
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index ac0ce2db4..04dbfaa20 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 167235 2012-09-29 06:58:03Z ibiru $
+# $Id: PKGBUILD 169450 2012-10-21 11:25:20Z ibiru $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
pkgbase=transmission
pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.71
+pkgver=2.73
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.transmissionbt.com/"
@@ -14,7 +14,7 @@ source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
transmission.tmpfiles)
build() {
- cd "$pkgbase-$pkgver"
+ cd "$pkgbase-2.72"
./configure --prefix=/usr
make
@@ -28,7 +28,7 @@ package_transmission-cli() {
backup=('etc/conf.d/transmissiond')
install=transmission-cli.install
- cd "$pkgbase-$pkgver"
+ cd "$pkgbase-2.72"
for dir in daemon cli web utils
do
@@ -50,7 +50,7 @@ package_transmission-gtk() {
'transmission-cli: daemon and web support')
install=transmission-gtk.install
- cd "$pkgbase-$pkgver"
+ cd "$pkgbase-2.72"
make -C gtk DESTDIR="$pkgdir" install
make -C po DESTDIR="$pkgdir" install
@@ -63,7 +63,7 @@ package_transmission-qt() {
optdepends=('transmission-cli: daemon and web support')
install=transmission-qt.install
- cd "$pkgbase-$pkgver"
+ cd "$pkgbase-2.72"
make -C qt INSTALL_ROOT="$pkgdir"/usr install
@@ -71,7 +71,7 @@ package_transmission-qt() {
install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png"
install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop"
}
-md5sums=('26d24de210076a7625e5fe37e3252f2a'
+md5sums=('86479f9bb378b793ce7a8a71f5b15904'
'7d6186ee2a852ae3d44980f05063e194'
'db72b02fee139e8ab416324e6c044d76'
'5c289c8901221a94be74665368ab5c2c'
diff --git a/extra/transmission/transmission-cli.install b/extra/transmission/transmission-cli.install
index 8ab275e61..94a829f5c 100644
--- a/extra/transmission/transmission-cli.install
+++ b/extra/transmission/transmission-cli.install
@@ -1,8 +1,8 @@
post_install() {
cat << _EOF
- If you want to run the Transmission daemon at boot,
- add transmissiond to the DAEMONS array in /etc/rc.conf.
+ If you want to run the Transmission daemon at boot do:
+ systemctl enable transmissiond
_EOF
post_upgrade
diff --git a/extra/usbview/PKGBUILD b/extra/usbview/PKGBUILD
index 093b7007d..e131c153f 100644
--- a/extra/usbview/PKGBUILD
+++ b/extra/usbview/PKGBUILD
@@ -1,25 +1,38 @@
-# $Id: PKGBUILD 143990 2011-12-01 15:29:15Z giovanni $
+# $Id: PKGBUILD 169432 2012-10-21 07:40:08Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=usbview
pkgver=1.1
-pkgrel=3
-pkgdesc="USB Viewer"
+pkgrel=4
+pkgdesc="Display the topology of devices on the USB bus"
arch=('i686' 'x86_64')
url="http://www.kroah.com/linux-usb/"
license=('GPL')
-depends=('gtk2')
-makedepends=('pkg-config')
-source=("http://www.kroah.com/linux-usb/${pkgname}-${pkgver}.tar.gz")
-md5sums=('8bf5e66351156356f3ad07454123affa')
+depends=('gtk3' 'desktop-file-utils')
+makedepends=('pkg-config' 'gendesk')
+install=${pkgname}.install
+source=("http://www.kroah.com/linux-usb/${pkgname}-${pkgver}.tar.gz"
+ 'usbview-1.1-gtk3-port.patch'
+ 'usbview-1.1-missing-usbfs.patch')
+md5sums=('8bf5e66351156356f3ad07454123affa'
+ '578ed1099228f205b728ee2d46ed6f56'
+ '02e4313887423d0057a7f4f15b7f37d4')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}"
+ gendesk -n
+ sed -i "s:Application;:Application;System:g" "${srcdir}"/${pkgname}.desktop
+
+ cd "${pkgname}-${pkgver}"
+
+ patch -Np1 -i "${srcdir}/usbview-1.1-gtk3-port.patch"
+ patch -Np1 -i "${srcdir}/usbview-1.1-missing-usbfs.patch"
+ autoreconf
./configure --prefix=/usr \
--sysconfdir=/etc \
- --localstatedir=/var
+ --localstatedir=/var
make
}
@@ -29,4 +42,10 @@ package() {
make prefix="${pkgdir}/usr" \
sysconfdir="${pkgdir}/etc" \
localstatedir="${pkgdir}/var" install
+
+ install -Dm0644 "${srcdir}"/${pkgname}.desktop \
+ "${pkgdir}"/usr/share/applications/${pkgname}.desktop
+
+ install -Dm0644 "${srcdir}"/${pkgname}-${pkgver}/usb_icon.xpm \
+ "${pkgdir}"/usr/share/pixmaps/${pkgname}.xpm
}
diff --git a/extra/usbview/usbview-1.1-gtk3-port.patch b/extra/usbview/usbview-1.1-gtk3-port.patch
new file mode 100644
index 000000000..9462dcf43
--- /dev/null
+++ b/extra/usbview/usbview-1.1-gtk3-port.patch
@@ -0,0 +1,802 @@
+--- a/Makefile.am 2009-03-11 03:25:46.000000000 +0100
++++ b/Makefile.am 2012-06-14 20:33:10.641639573 +0200
+@@ -16,10 +16,8 @@
+ interface.c \
+ callbacks.c \
+ usbtree.c usbtree.h \
+- showmessage.c \
+ usbparse.c usbparse.h \
+ configure-dialog.c \
+- about-dialog.c \
+ usbview_logo.xpm \
+ usbview_logo.xcf \
+ usb_icon.xpm \
+--- a/callbacks.c 2008-06-25 23:03:13.000000000 +0200
++++ b/callbacks.c 2012-06-14 21:06:05.000523489 +0200
+@@ -23,13 +23,13 @@
+ #endif
+
+ #include <gtk/gtk.h>
+-
+ #include "usbtree.h"
++#include "usbview_logo.xpm" /* logo */
+
+
+ void on_buttonClose_clicked (GtkButton *button, gpointer user_data)
+ {
+- gtk_exit(0);
++ gtk_main_quit();
+ }
+
+
+@@ -55,7 +55,21 @@
+
+ void on_buttonAbout_clicked (GtkButton *button, gpointer user_data)
+ {
+- about_dialog ();
++ GdkPixbuf *logo;
++ gchar *authors[] = { "Greg Kroah-Hartman <greg@kroah.com>", NULL };
++
++ logo = gdk_pixbuf_new_from_xpm_data ((const char **)usbview_logo_xpm);
++ gtk_show_about_dialog (GTK_WINDOW (windowMain),
++ "logo", logo,
++ "program-name", "usbview",
++ "version", VERSION,
++ "comments", "Display information on USB devices",
++ "website-label", "http://www.kroah.com/linux-usb/",
++ "website", "http://www.kroah.com/linux-usb/",
++ "copyright", "Copyright © 1999-2012",
++ "authors", authors,
++ NULL);
++ g_object_unref (logo);
+ }
+
+
+--- a/configure-dialog.c 2009-03-11 02:40:28.000000000 +0100
++++ b/configure-dialog.c 2012-06-14 21:06:05.000523489 +0200
+@@ -24,264 +24,78 @@
+ #endif
+
+ #include <gtk/gtk.h>
+-#include <stdio.h>
+-#include <stdlib.h>
+ #include <string.h>
+-#include <ctype.h>
+-
+ #include "usbtree.h"
+ #include "usbparse.h"
+
+-
+-
+-
+ static GtkWidget *fileEntry;
+-static GtkWidget *filew;
+-static char *sFilename;
+-
+-/*
+- * Get the selected filename and print it to the console
+- */
+-static void file_ok_sel (GtkWidget *w, GtkFileSelection *fs)
+-{
+- const char *sTempFile;
+-
+- /* --- Get the name --- */
+- sTempFile = gtk_file_selection_get_filename (GTK_FILE_SELECTION (fs));
+-
+- /* --- Allocate space and save it. --- */
+- sFilename = malloc (sizeof (char) * (strlen (sTempFile) + 1));
+- strcpy (sFilename, sTempFile);
+-
+- /* --- Destroy the file selection --- */
+- gtk_widget_destroy (filew);
+-}
+-
+-
+-static void file_cancel_sel (GtkWidget *w, GtkFileSelection *fs)
+-{
+- /* --- Destroy the file selection --- */
+- gtk_widget_destroy (filew);
+-}
+-
+-
+-/*
+- * DestroyDialog
+- *
+- * Destroy the dialog (obvious, eh?) but also remove the
+- * grab and close the modal.
+- */
+-static int DestroyDialog (GtkWidget *widget, gpointer *data)
+-{
+- gtk_grab_remove (widget);
+- gtk_main_quit ();
+- return(FALSE);
+-}
+-
+-
+-/*
+- * GetFilename
+- */
+-static char *GetFilename (char *sTitle, char *initialFilename)
+-{
+- sFilename = NULL;
+-
+- /* --- Create a new file selection widget --- */
+- filew = gtk_file_selection_new (sTitle);
+-
+- /* --- If it's destroyed --- */
+- gtk_signal_connect (GTK_OBJECT (filew), "destroy", (GtkSignalFunc) DestroyDialog, &filew);
+-
+- /* --- Connect the ok_button to file_ok_sel function --- */
+- gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filew)->ok_button), "clicked", (GtkSignalFunc) file_ok_sel, filew );
+-
+- /* --- Connect the cancel_button to destroy the widget --- */
+- gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filew)->cancel_button), "clicked", (GtkSignalFunc) file_cancel_sel, filew);
+-
+- /* --- Lets set the filename --- */
+- gtk_file_selection_set_filename (GTK_FILE_SELECTION(filew), initialFilename);
+-
+- /* --- Turn off the file operation buttons --- */
+- gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION(filew));
+-
+- /* --- Of course, we show it --- */
+- gtk_widget_show (filew);
+-
+- /* --- Make sure we keep the focus --- */
+- gtk_grab_add (filew);
+-
+- gtk_main ();
+-
+- return(sFilename);
+-}
+-
+-
+-static void ClearShowMessage (GtkWidget *widget, gpointer data)
+-{
+- gtk_grab_remove (widget);
+-}
+-
+-static void CancelConfigureDialog (GtkWidget *widget, gpointer data)
+-{
+- GtkWidget *dialogWidget = (GtkWidget *) data;
+-
+- gtk_grab_remove (dialogWidget);
+-
+- /* --- Close the widget --- */
+- gtk_widget_destroy (dialogWidget);
+-}
+-
+-static void OkConfigureDialog (GtkWidget *widget, gpointer data)
+-{
+- GtkWidget *dialogWidget = (GtkWidget *) data;
+- gchar *editString;
+-
+- editString = gtk_editable_get_chars (GTK_EDITABLE (fileEntry), 0, -1);
+-
+- gtk_grab_remove (dialogWidget);
+-
+- /* --- Close the widget --- */
+- gtk_widget_destroy (dialogWidget);
+-
+- strcpy (devicesFile, editString);
+- g_free (editString);
+- LoadUSBTree(0);
+-}
+-
+
+ static void fileSelectButtonClick (GtkWidget *widget, gpointer data)
+ {
+- gchar *newFilename;
++ GtkWidget *dialog;
++ gchar *filename;
+
+- newFilename = GetFilename ("locate usbdevfs devices file", devicesFile);
+-
+- if (newFilename != NULL) {
+- gtk_entry_set_text (GTK_ENTRY (fileEntry), newFilename);
+- gtk_widget_show (fileEntry);
+- g_free (newFilename);
++ dialog = gtk_file_chooser_dialog_new (
++ "locate usbdevfs devices file",
++ GTK_WINDOW (windowMain),
++ GTK_FILE_CHOOSER_ACTION_OPEN,
++ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
++ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
++ NULL);
++
++ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
++ {
++ filename = gtk_file_chooser_get_filename(
++ GTK_FILE_CHOOSER (dialog));
++ gtk_entry_set_text (GTK_ENTRY (fileEntry), filename);
++ g_free (filename);
+ }
++
++ gtk_widget_destroy (dialog);
+ }
+
+-
+ void configure_dialog (void)
+ {
+- GtkWidget *configDialog;
+- GtkWidget *dialog_vbox2;
++ GtkWidget *dialog, *content_area;
+ GtkWidget *hbox1;
+ GtkWidget *label1;
+- GtkWidget *label41;
+- GtkWidget *label42;
+- GtkWidget *label43;
+- GtkWidget *vbox1;
+- GtkWidget *dialog_action_area2;
+- GtkWidget *hbuttonbox2;
+- GtkWidget *okButton;
+- GtkWidget *cancelButton;
+ GtkWidget *fileSelectButton;
++ gchar *editString;
++ gint result;
+
+- configDialog = gtk_dialog_new ();
+- gtk_object_set_data (GTK_OBJECT (configDialog), "configDialog", configDialog);
+- gtk_window_set_title (GTK_WINDOW (configDialog), "USB View Configuration");
+- gtk_window_set_policy (GTK_WINDOW (configDialog), TRUE, TRUE, FALSE);
+-
+- dialog_vbox2 = GTK_DIALOG (configDialog)->vbox;
+- gtk_object_set_data (GTK_OBJECT (configDialog), "dialog_vbox2", dialog_vbox2);
+- gtk_widget_show (dialog_vbox2);
+-
+- vbox1 = gtk_vbox_new (FALSE, 0);
+- gtk_widget_ref (vbox1);
+- gtk_object_set_data_full (GTK_OBJECT (configDialog), "vbox1", vbox1, (GtkDestroyNotify) gtk_widget_unref);
+- gtk_widget_show (vbox1);
+- gtk_box_pack_start (GTK_BOX (dialog_vbox2), vbox1, TRUE, TRUE, 0);
+-
+- label41 = gtk_label_new ("");
+- gtk_widget_ref (label41);
+- gtk_object_set_data_full (GTK_OBJECT (configDialog), "label41", label41, (GtkDestroyNotify) gtk_widget_unref);
+- gtk_widget_show (label41);
+- gtk_box_pack_start (GTK_BOX (vbox1), label41, FALSE, FALSE, 0);
+-
+- hbox1 = gtk_hbox_new (FALSE, 0);
+- gtk_widget_ref (hbox1);
+- gtk_object_set_data_full (GTK_OBJECT (configDialog), "hbox1", hbox1, (GtkDestroyNotify) gtk_widget_unref);
+- gtk_widget_show (hbox1);
+-// gtk_box_pack_start (GTK_BOX (dialog_vbox2), hbox1, TRUE, TRUE, 0);
+- gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 0);
+-
+- label42 = gtk_label_new ("");
+- gtk_widget_ref (label42);
+- gtk_object_set_data_full (GTK_OBJECT (configDialog), "label42", label42, (GtkDestroyNotify) gtk_widget_unref);
+- gtk_widget_show (label42);
+- gtk_box_pack_start (GTK_BOX (vbox1), label42, FALSE, FALSE, 0);
+-
+-
+- label1 = gtk_label_new (" Location of usbdevfs devices file");
+- gtk_widget_ref (label1);
+- gtk_object_set_data_full (GTK_OBJECT (configDialog), "label1", label1, (GtkDestroyNotify) gtk_widget_unref);
+- gtk_widget_show (label1);
++ dialog = gtk_dialog_new_with_buttons (
++ "USB View Configuration",
++ GTK_WINDOW (windowMain),
++ GTK_DIALOG_DESTROY_WITH_PARENT,
++ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
++ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
++ NULL);
++
++ content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
++
++ hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
++ gtk_container_add (GTK_CONTAINER (content_area), hbox1);
++
++ label1 = gtk_label_new ("Location of usbdevfs devices file");
+ gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 5);
+
+ fileEntry = gtk_entry_new ();
+- gtk_widget_ref (fileEntry);
+- gtk_object_set_data_full (GTK_OBJECT (configDialog), "fileEntry", fileEntry, (GtkDestroyNotify) gtk_widget_unref);
+ gtk_entry_set_text (GTK_ENTRY (fileEntry), devicesFile);
+- gtk_widget_show (fileEntry);
+ gtk_box_pack_start (GTK_BOX (hbox1), fileEntry, TRUE, TRUE, 0);
+
+- dialog_action_area2 = GTK_DIALOG (configDialog)->action_area;
+- gtk_object_set_data (GTK_OBJECT (configDialog), "dialog_action_area2", dialog_action_area2);
+- gtk_widget_show (dialog_action_area2);
+- gtk_container_set_border_width (GTK_CONTAINER (dialog_action_area2), 1);
+-
+- hbuttonbox2 = gtk_hbutton_box_new ();
+- gtk_widget_ref (hbuttonbox2);
+- gtk_object_set_data_full (GTK_OBJECT (configDialog), "hbuttonbox2", hbuttonbox2, (GtkDestroyNotify) gtk_widget_unref);
+- gtk_widget_show (hbuttonbox2);
+- gtk_box_pack_start (GTK_BOX (dialog_action_area2), hbuttonbox2, TRUE, TRUE, 11);
+-
+- okButton = gtk_button_new_with_label (" OK ");
+- gtk_widget_ref (okButton);
+- gtk_object_set_data_full (GTK_OBJECT (configDialog), "okButton", okButton, (GtkDestroyNotify) gtk_widget_unref);
+- gtk_widget_show (okButton);
+- gtk_container_add (GTK_CONTAINER (hbuttonbox2), okButton);
+- GTK_WIDGET_SET_FLAGS (okButton, GTK_CAN_DEFAULT);
+-
+- cancelButton = gtk_button_new_with_label (" Cancel ");
+- gtk_widget_ref (cancelButton);
+- gtk_object_set_data_full (GTK_OBJECT (configDialog), "cancelButton", cancelButton, (GtkDestroyNotify) gtk_widget_unref);
+- gtk_widget_show (cancelButton);
+- gtk_container_add (GTK_CONTAINER (hbuttonbox2), cancelButton);
+- GTK_WIDGET_SET_FLAGS (cancelButton, GTK_CAN_DEFAULT);
+-
+ fileSelectButton = gtk_button_new_with_label ("...");
+- gtk_widget_ref (fileSelectButton);
+- gtk_object_set_data_full (GTK_OBJECT (configDialog), "fileSelectButton", fileSelectButton, (GtkDestroyNotify) gtk_widget_unref);
+- gtk_widget_show (fileSelectButton);
+-
++ g_signal_connect (G_OBJECT (fileSelectButton), "clicked",
++ G_CALLBACK (fileSelectButtonClick), NULL);
+ gtk_box_pack_start (GTK_BOX (hbox1), fileSelectButton, TRUE, FALSE, 1);
+
+- label43 = gtk_label_new (" ");
+- gtk_widget_ref (label43);
+- gtk_object_set_data_full (GTK_OBJECT (configDialog), "label43", label43, (GtkDestroyNotify) gtk_widget_unref);
+- gtk_widget_show (label43);
+- gtk_box_pack_start (GTK_BOX (hbox1), label43, FALSE, FALSE, 0);
+-
+- gtk_signal_connect (GTK_OBJECT (okButton), "clicked", GTK_SIGNAL_FUNC (OkConfigureDialog), configDialog);
+- gtk_signal_connect (GTK_OBJECT (cancelButton), "clicked", GTK_SIGNAL_FUNC (CancelConfigureDialog), configDialog);
+- gtk_signal_connect (GTK_OBJECT (fileSelectButton), "clicked", GTK_SIGNAL_FUNC (fileSelectButtonClick), configDialog);
+-
+- /* --- Default the "Ok" button --- */
+- GTK_WIDGET_SET_FLAGS (okButton, GTK_CAN_DEFAULT);
+- gtk_widget_grab_default (okButton);
+-
+- gtk_signal_connect (GTK_OBJECT (configDialog), "destroy", GTK_SIGNAL_FUNC (ClearShowMessage), NULL);
+-
+- /* --- Show the dialog --- */
+- gtk_widget_show (configDialog);
+-
+- /* --- Only this window can have actions done. --- */
+- gtk_grab_add (configDialog);
+-
+- return;
++ gtk_widget_show_all (dialog);
++ result = gtk_dialog_run(GTK_DIALOG (dialog));
++ if (result == GTK_RESPONSE_ACCEPT) {
++ editString = gtk_editable_get_chars (
++ GTK_EDITABLE (fileEntry), 0, -1);
++ strcpy (devicesFile, editString);
++ g_free (editString);
++ LoadUSBTree (0);
++ }
++ gtk_widget_destroy (dialog);
+ }
+-
+-
+--- a/configure.in 2007-10-23 02:03:36.000000000 +0200
++++ b/configure.in 2012-06-14 20:25:16.629667442 +0200
+@@ -1,7 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+
+ AC_INIT(configure.in)
+-AM_INIT_AUTOMAKE(usbview, 1.0)
++AM_INIT_AUTOMAKE(usbview, 1.1)
+ AM_CONFIG_HEADER(config.h)
+
+ # required versions of other packages
+@@ -12,33 +12,10 @@
+ AM_PROG_CC_STDC
+ AC_HEADER_STDC
+
+-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0.5)
++PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0)
+ AC_SUBST(GTK_FLAGS)
+ AC_SUBST(GTK_LIBS)
+
+-
+-dnl Set PACKAGE_LOCALE_DIR in config.h.
+-if test "x${prefix}" = "xNONE"; then
+- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale")
+-else
+- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale")
+-fi
+-
+-dnl Set PACKAGE_DATA_DIR in config.h.
+-if test "x${datadir}" = 'x${prefix}/share'; then
+- if test "x${prefix}" = "xNONE"; then
+- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}")
+- else
+- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}")
+- fi
+-else
+- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}")
+-fi
+-
+-dnl Set PACKAGE_SOURCE_DIR in config.h.
+-packagesrcdir=`cd $srcdir && pwd`
+-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}")
+-
+ dnl Use -Wall if we have gcc.
+ changequote(,)dnl
+ if test "x$GCC" = "xyes"; then
+--- a/interface.c 2009-03-11 03:11:47.000000000 +0100
++++ b/interface.c 2012-06-14 21:06:05.000523489 +0200
+@@ -32,15 +32,16 @@
+ #include "usb_icon.xpm"
+
+ GtkWidget *treeUSB;
++GtkTreeStore *treeStore;
+ GtkTextBuffer *textDescriptionBuffer;
+ GtkWidget *textDescriptionView;
++GtkWidget *windowMain;
+
+ int timer;
+
+ GtkWidget*
+ create_windowMain ()
+ {
+- GtkWidget *windowMain;
+ GtkWidget *vbox1;
+ GtkWidget *hpaned1;
+ GtkWidget *scrolledwindow1;
+@@ -50,68 +51,61 @@
+ GtkWidget *buttonClose;
+ GtkWidget *buttonAbout;
+ GdkPixbuf *icon;
++ GtkCellRenderer *treeRenderer;
++ GtkTreeViewColumn *treeColumn;
+
+ windowMain = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_widget_set_name (windowMain, "windowMain");
+- gtk_object_set_data (GTK_OBJECT (windowMain), "windowMain", windowMain);
+ gtk_window_set_title (GTK_WINDOW (windowMain), "USB Viewer");
+- gtk_window_set_default_size (GTK_WINDOW (windowMain), 500, 300);
++ gtk_window_set_default_size (GTK_WINDOW (windowMain), 600, 300);
+
+ icon = gdk_pixbuf_new_from_xpm_data((const char **)usb_icon_xpm);
+ gtk_window_set_icon(GTK_WINDOW(windowMain), icon);
+
+- vbox1 = gtk_vbox_new (FALSE, 0);
++ vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_widget_set_name (vbox1, "vbox1");
+- gtk_widget_ref (vbox1);
+- gtk_object_set_data_full (GTK_OBJECT (windowMain), "vbox1", vbox1,
+- (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (vbox1);
+ gtk_container_add (GTK_CONTAINER (windowMain), vbox1);
+
+- hpaned1 = gtk_hpaned_new ();
++ hpaned1 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
+ gtk_widget_set_name (hpaned1, "hpaned1");
+- gtk_widget_ref (hpaned1);
+- gtk_object_set_data_full (GTK_OBJECT (windowMain), "hpaned1", hpaned1,
+- (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (hpaned1);
+ gtk_box_pack_start (GTK_BOX (vbox1), hpaned1, TRUE, TRUE, 0);
+- gtk_paned_set_position (GTK_PANED (hpaned1), 200);
+
+- treeUSB = gtk_ctree_new_with_titles (1, 0, NULL);
++ treeStore = gtk_tree_store_new (N_COLUMNS,
++ G_TYPE_STRING, /* NAME_COLUMN */
++ G_TYPE_INT, /* DEVICE_ADDR_COLUMN */
++ G_TYPE_STRING /* COLOR_COLUMN */);
++ treeUSB = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treeStore));
++ treeRenderer = gtk_cell_renderer_text_new ();
++ treeColumn = gtk_tree_view_column_new_with_attributes (
++ "USB devices",
++ treeRenderer,
++ "text", NAME_COLUMN,
++ "foreground", COLOR_COLUMN,
++ NULL);
++ gtk_tree_view_append_column (GTK_TREE_VIEW (treeUSB), treeColumn);
+ gtk_widget_set_name (treeUSB, "treeUSB");
+- gtk_widget_ref (treeUSB);
+- gtk_object_set_data_full (GTK_OBJECT (windowMain), "treeUSB", treeUSB,
+- (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (treeUSB);
+- gtk_container_add (GTK_CONTAINER (hpaned1), treeUSB);
+- gtk_widget_set_usize (treeUSB, 200, -2);
++ gtk_paned_pack1 (GTK_PANED (hpaned1), treeUSB, FALSE, FALSE);
+
+ scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
+ gtk_widget_set_name (scrolledwindow1, "scrolledwindow1");
+- gtk_widget_ref (scrolledwindow1);
+- gtk_object_set_data_full (GTK_OBJECT (windowMain), "scrolledwindow1", scrolledwindow1,
+- (GtkDestroyNotify) gtk_widget_unref);
+- gtk_widget_show (scrolledwindow1);
+- gtk_container_add (GTK_CONTAINER (hpaned1), scrolledwindow1);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
++ gtk_widget_show (scrolledwindow1);
++ gtk_paned_pack2 (GTK_PANED (hpaned1), scrolledwindow1, TRUE, FALSE);
+
+ textDescriptionBuffer = gtk_text_buffer_new(NULL);
+ //textDescription = gtk_text_new (NULL, NULL);
+ textDescriptionView = gtk_text_view_new_with_buffer(textDescriptionBuffer);
+ gtk_widget_set_name (textDescriptionView, "textDescription");
+- gtk_widget_ref (textDescriptionView);
+- gtk_object_set_data_full (GTK_OBJECT (windowMain), "textDescription", textDescriptionView,
+- (GtkDestroyNotify) gtk_widget_unref);
+ gtk_text_view_set_editable(GTK_TEXT_VIEW(textDescriptionView), FALSE);
+ gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textDescriptionView), FALSE);
+ gtk_widget_show (textDescriptionView);
+ gtk_container_add (GTK_CONTAINER (scrolledwindow1), textDescriptionView);
+
+- hbuttonbox1 = gtk_hbutton_box_new ();
++ hbuttonbox1 = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+ gtk_widget_set_name (hbuttonbox1, "hbuttonbox1");
+- gtk_widget_ref (hbuttonbox1);
+- gtk_object_set_data_full (GTK_OBJECT (windowMain), "hbuttonbox1", hbuttonbox1,
+- (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (hbuttonbox1);
+ gtk_box_pack_start (GTK_BOX (vbox1), hbuttonbox1, FALSE, FALSE, 5);
+ //gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox1), 10);
+@@ -120,58 +115,46 @@
+
+ buttonRefresh = gtk_button_new_from_stock(GTK_STOCK_REFRESH);
+ gtk_widget_set_name (buttonRefresh, "buttonRefresh");
+- gtk_widget_ref (buttonRefresh);
+- gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonRefresh", buttonRefresh,
+- (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (buttonRefresh);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonRefresh);
+ gtk_container_set_border_width (GTK_CONTAINER (buttonRefresh), 4);
+- GTK_WIDGET_SET_FLAGS (buttonRefresh, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default (buttonRefresh, TRUE);
+
+ buttonConfigure = gtk_button_new_with_label ("Configure...");
+ gtk_widget_set_name (buttonConfigure, "buttonConfigure");
+- gtk_widget_ref (buttonConfigure);
+- gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonConfigure", buttonConfigure,
+- (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (buttonConfigure);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonConfigure);
+ gtk_container_set_border_width (GTK_CONTAINER (buttonConfigure), 4);
+- GTK_WIDGET_SET_FLAGS (buttonConfigure, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default (buttonConfigure, TRUE);
+
+ buttonAbout = gtk_button_new_from_stock(GTK_STOCK_ABOUT);
+ gtk_widget_set_name (buttonAbout, "buttonAbout");
+- gtk_widget_ref (buttonAbout);
+- gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonAbout", buttonAbout,
+- (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (buttonAbout);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonAbout);
+ gtk_container_set_border_width (GTK_CONTAINER (buttonAbout), 4);
+- GTK_WIDGET_SET_FLAGS (buttonAbout, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default (buttonAbout, TRUE);
+
+ buttonClose = gtk_button_new_from_stock(GTK_STOCK_QUIT);
+ gtk_widget_set_name (buttonClose, "buttonClose");
+- gtk_widget_ref (buttonClose);
+- gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonClose", buttonClose,
+- (GtkDestroyNotify) gtk_widget_unref);
+ gtk_widget_show (buttonClose);
+ gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonClose);
+ gtk_container_set_border_width (GTK_CONTAINER (buttonClose), 4);
+- GTK_WIDGET_SET_FLAGS (buttonClose, GTK_CAN_DEFAULT);
++ gtk_widget_set_can_default (buttonClose, TRUE);
+
+- gtk_signal_connect (GTK_OBJECT (windowMain), "delete_event",
+- GTK_SIGNAL_FUNC (on_window1_delete_event),
++ g_signal_connect (G_OBJECT (windowMain), "delete_event",
++ G_CALLBACK (on_window1_delete_event),
+ NULL);
+- gtk_signal_connect (GTK_OBJECT (buttonRefresh), "clicked",
+- GTK_SIGNAL_FUNC (on_buttonRefresh_clicked),
++ g_signal_connect (G_OBJECT (buttonRefresh), "clicked",
++ G_CALLBACK (on_buttonRefresh_clicked),
+ NULL);
+- gtk_signal_connect (GTK_OBJECT (buttonConfigure), "clicked",
+- GTK_SIGNAL_FUNC (on_buttonConfigure_clicked),
++ g_signal_connect (G_OBJECT (buttonConfigure), "clicked",
++ G_CALLBACK (on_buttonConfigure_clicked),
+ NULL);
+- gtk_signal_connect (GTK_OBJECT (buttonAbout), "clicked",
+- GTK_SIGNAL_FUNC (on_buttonAbout_clicked),
++ g_signal_connect (G_OBJECT (buttonAbout), "clicked",
++ G_CALLBACK (on_buttonAbout_clicked),
+ NULL);
+- gtk_signal_connect (GTK_OBJECT (buttonClose), "clicked",
+- GTK_SIGNAL_FUNC (on_buttonClose_clicked),
++ g_signal_connect (G_OBJECT (buttonClose), "clicked",
++ G_CALLBACK (on_buttonClose_clicked),
+ NULL);
+
+ /* create our timer */
+--- a/main.c 2008-06-25 23:03:27.000000000 +0200
++++ b/main.c 2012-06-14 21:06:05.000523489 +0200
+@@ -30,7 +30,6 @@
+ {
+ GtkWidget *window1;
+
+- gtk_set_locale ();
+ gtk_init (&argc, &argv);
+
+ initialize_stuff();
+--- a/usbparse.h 2008-06-25 23:03:47.000000000 +0200
++++ b/usbparse.h 2012-06-14 21:06:05.000523489 +0200
+@@ -166,7 +166,7 @@
+ struct Device *child[MAX_CHILDREN];
+ DeviceBandwidth *bandwidth;
+ GtkWidget *tree;
+- GtkCTreeNode *leaf;
++ GtkTreeIter leaf;
+ } Device;
+
+
+--- a/usbtree.c 2012-06-14 21:08:11.672516042 +0200
++++ b/usbtree.c 2012-06-14 21:06:05.000523489 +0200
+@@ -45,7 +45,7 @@
+
+ /* blow away the tree if there is one */
+ if (rootDevice != NULL) {
+- gtk_ctree_remove_node (GTK_CTREE(treeUSB), GTK_CTREE_NODE(rootDevice->leaf));
++ gtk_tree_store_clear (treeStore);
+ }
+
+ /* clean out the text box */
+@@ -208,32 +208,37 @@
+ }
+
+
+-void SelectItem (GtkWidget *widget, GtkCTreeNode *node, gint column, gpointer userData)
++void SelectItem (GtkTreeSelection *selection, gpointer userData)
+ {
+- int data;
+- data = (int) gtk_ctree_node_get_row_data (GTK_CTREE (widget), node);
+-
+- PopulateListBox ((int)data);
+-
+- return;
++ GtkTreeIter iter;
++ GtkTreeModel *model;
++ gint deviceAddr;
++
++ if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
++ gtk_tree_model_get (model, &iter,
++ DEVICE_ADDR_COLUMN, &deviceAddr,
++ -1);
++ PopulateListBox (deviceAddr);
++ }
+ }
+
+
+ static void DisplayDevice (Device *parent, Device *device)
+ {
+ int i;
+- gchar *text[1];
+ int configNum;
+ int interfaceNum;
+ gboolean driverAttached = TRUE;
++ gint deviceAddr;
++ const gchar *color = "black";
+
+ if (device == NULL)
+ return;
+
+ /* build this node */
+- text[0] = device->name;
+- device->leaf = gtk_ctree_insert_node (GTK_CTREE(treeUSB), parent->leaf, NULL, text, 1, NULL, NULL, NULL, NULL, FALSE, FALSE);
+- gtk_ctree_node_set_row_data (GTK_CTREE(treeUSB), device->leaf, (gpointer)((device->deviceNumber<<8) | (device->busNumber)));
++ deviceAddr = (device->deviceNumber << 8) | device->busNumber;
++ gtk_tree_store_append (treeStore, &device->leaf,
++ (device->level != 0) ? &parent->leaf : NULL);
+
+ /* determine if this device has drivers attached to all interfaces */
+ for (configNum = 0; configNum < MAX_CONFIGS; ++configNum) {
+@@ -252,15 +257,14 @@
+ }
+
+ /* change the color of this leaf if there are no drivers attached to it */
+- if (driverAttached == FALSE) {
+- GdkColor red;
+-
+- red.red = 56000;
+- red.green = 0;
+- red.blue = 0;
+- red.pixel = 0;
+- gtk_ctree_node_set_foreground (GTK_CTREE(treeUSB), device->leaf, &red);
+- }
++ if (driverAttached == FALSE)
++ color = "red";
++
++ gtk_tree_store_set (treeStore, &device->leaf,
++ NAME_COLUMN, device->name,
++ DEVICE_ADDR_COLUMN, deviceAddr,
++ COLOR_COLUMN, color,
++ -1);
+
+ /* create all of the children's leafs */
+ for (i = 0; i < MAX_CHILDREN; ++i) {
+@@ -283,11 +287,16 @@
+
+ static void FileError (void)
+ {
+- gchar *tempString = g_malloc0(strlen (verifyMessage) + strlen (devicesFile) + 50);
+- sprintf (tempString, " Can not open the file %s \n\n%s", devicesFile, verifyMessage);
+- ShowMessage ("USBView Error", tempString, FALSE);
+- g_free (tempString);
+- return;
++ GtkWidget *dialog;
++
++ dialog = gtk_message_dialog_new (
++ GTK_WINDOW (windowMain),
++ GTK_DIALOG_DESTROY_WITH_PARENT,
++ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
++ "Can not open the file %s\n\n%s",
++ devicesFile, verifyMessage);
++ gtk_dialog_run (GTK_DIALOG (dialog));
++ gtk_widget_destroy (dialog);
+ }
+
+
+@@ -328,10 +337,6 @@
+ int finished;
+ int i;
+
+- if (MessageShown() == TRUE) {
+- return;
+- }
+-
+ /* if refresh is selected, then always do a refresh, otherwise look at the file first */
+ if (!refresh) {
+ if (!FileHasChanged()) {
+@@ -368,11 +373,5 @@
+ usb_name_devices ();
+
+- /* set up our tree */
+- gtk_ctree_set_line_style (GTK_CTREE(treeUSB), GTK_CTREE_LINES_DOTTED);
+- gtk_ctree_set_expander_style (GTK_CTREE(treeUSB), GTK_CTREE_EXPANDER_SQUARE);
+- gtk_ctree_set_indent (GTK_CTREE(treeUSB),10);
+- gtk_clist_column_titles_passive (GTK_CLIST(treeUSB));
+-
+ /* build our tree */
+ for (i = 0; i < rootDevice->maxChildren; ++i) {
+ DisplayDevice (rootDevice, rootDevice->child[i]);
+@@ -380,11 +386,14 @@
+
+ gtk_widget_show (treeUSB);
+
+- gtk_ctree_expand_recursive (GTK_CTREE(treeUSB), NULL);
++ gtk_tree_view_expand_all (GTK_TREE_VIEW (treeUSB));
+
+ /* hook up our callback function to this tree if we haven't yet */
+ if (!signal_connected) {
+- gtk_signal_connect (GTK_OBJECT (treeUSB), "tree-select-row", GTK_SIGNAL_FUNC (SelectItem), NULL);
++ GtkTreeSelection *select;
++ select = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeUSB));
++ g_signal_connect (G_OBJECT (select), "changed",
++ G_CALLBACK (SelectItem), NULL);
+ signal_connected = TRUE;
+ }
+
+--- a/usbtree.h 2008-06-25 23:03:52.000000000 +0200
++++ b/usbtree.h 2012-06-14 21:06:05.000523489 +0200
+@@ -21,16 +21,24 @@
+ #ifndef __USB_TREE_H
+ #define __USB_TREE_H
+
++enum {
++ NAME_COLUMN,
++ DEVICE_ADDR_COLUMN,
++ COLOR_COLUMN,
++ N_COLUMNS
++};
++
+ extern gchar devicesFile[1000];
++extern GtkTreeStore *treeStore;
+ extern GtkWidget *treeUSB;
+ extern GtkWidget *textDescriptionView;
+ extern GtkTextBuffer *textDescriptionBuffer;
++extern GtkWidget *windowMain;
+
+ extern void LoadUSBTree (int refresh);
+ extern void initialize_stuff (void);
+ extern GtkWidget * create_windowMain (void);
+ extern void configure_dialog (void);
+-extern void about_dialog (void);
+
+ extern void on_buttonClose_clicked (GtkButton *button, gpointer user_data);
+ extern gboolean on_window1_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data);
+@@ -39,8 +47,4 @@
+ extern void on_buttonAbout_clicked (GtkButton *button, gpointer user_data);
+ extern gint on_timer_timeout (gpointer user_data);
+
+-extern void ShowMessage (gchar *title, gchar *message, gboolean centered);
+-extern gboolean MessageShown (void);
+-
+-
+ #endif /* __USB_TREE_H */
diff --git a/extra/usbview/usbview-1.1-missing-usbfs.patch b/extra/usbview/usbview-1.1-missing-usbfs.patch
new file mode 100644
index 000000000..7da2f0ca0
--- /dev/null
+++ b/extra/usbview/usbview-1.1-missing-usbfs.patch
@@ -0,0 +1,11 @@
+--- a/usbtree.c 2012-10-21 08:21:35.000000000 +0200
++++ b/usbtree.c 2012-10-21 08:21:12.000000000 +0200
+@@ -397,7 +397,7 @@
+
+ void initialize_stuff (void)
+ {
+- strcpy (devicesFile, "/proc/bus/usb/devices");
++ strcpy (devicesFile, "/sys/kernel/debug/usb/devices");
+ memset (&previousDevicesFile[0], 0x00, sizeof(previousDevicesFile));
+ previousChange = 0;
+
diff --git a/extra/usbview/usbview.install b/extra/usbview/usbview.install
new file mode 100644
index 000000000..e111ef946
--- /dev/null
+++ b/extra/usbview/usbview.install
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index f5a047404..52ed7381d 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166660 2012-09-15 04:03:40Z tdziedzic $
+# $Id: PKGBUILD 169487 2012-10-22 02:10:39Z tdziedzic $
# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Maintainer: tobias [ tobias at archlinux org ]
# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
@@ -6,8 +6,8 @@
pkgbase=vim
pkgname=('vim' 'gvim' 'vim-runtime')
_topver=7.3
-_patchlevel=661
-__hgrev=5884d056e1d1
+_patchlevel=709
+__hgrev=06e088d016ad
_versiondir="vim${_topver//./}"
pkgver=${_topver}.${_patchlevel}
pkgrel=1
@@ -21,12 +21,12 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
'vimrc'
'archlinux.vim'
'gvim.desktop')
-sha1sums=('989e907fe9858647e762bddc927f656a03fb5226'
- '195c7fc5163fca966ea331d8160bf2d307c1533c'
- '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2'
- '3494baf53a63581ba69f86a81293640ff681c5c5'
- '25dd3c2ce436e73a367c8f73b68f7f6889682437'
- '4a579cf66590d711f49c5dfb4a25e5df116ff7ba')
+md5sums=('7a42c72b07e8bfe6795197a303b21d53'
+ '5c5723f3c39aaa716bd868d7edf9f563'
+ '6e7adfbd5d26c1d161030ec203a7f243'
+ 'e57777374891063b9ca48a1fe392ac05'
+ '10353a61aadc3f276692d0e17db1478e'
+ 'd90413bd21f400313a785bb4010120cd')
# source PKGBUILD && mksource
mksource() {
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 7fee32771..d54ca33fa 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169077 2012-10-17 18:09:33Z giovanni $
+# $Id: PKGBUILD 169442 2012-10-21 09:07:49Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
pkgname=vlc
pkgver=2.0.4
-pkgrel=1
+pkgrel=2
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
arch=('i686' 'x86_64')
url="http://www.videolan.org/vlc/"
@@ -19,7 +19,7 @@ makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
'fluidsynth' 'libdc1394' 'libavc1394' 'lirc-utils'
'libcaca' 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd'
'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss'
- 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager')
+ 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus')
optdepends=('avahi: for service discovery using bonjour protocol'
'libnotify: for notification plugin'
'ncurses: for ncurses interface support'
@@ -49,7 +49,8 @@ optdepends=('avahi: for service discovery using bonjour protocol'
'smbclient: for SMB access plugin'
'libcdio: for audio CD playback support'
'ttf-freefont: for subtitle font '
- 'ttf-dejavu: for subtitle font')
+ 'ttf-dejavu: for subtitle font'
+ 'opus: for opus support')
conflicts=('vlc-plugin')
replaces=('vlc-plugin')
backup=('usr/share/vlc/lua/http/.hosts'
@@ -78,7 +79,8 @@ build() {
--enable-xosd \
--enable-aa \
--enable-vcdx \
- --enable-upnp
+ --enable-upnp \
+ --enable-opus
make
}
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index c643205da..239d5a1b0 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169365 2012-10-20 06:35:06Z andyrtr $
+# $Id: PKGBUILD 169469 2012-10-21 18:59:02Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xf86-video-intel
-pkgver=2.20.10
+pkgver=2.20.12
pkgrel=1
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
@@ -19,7 +19,7 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS
options=('!libtool')
groups=('xorg-drivers' 'xorg')
source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('df41a28c3d877f3c5e87cd7d840f51fd38dde8bc91f5f0d09510fb8e2336cdcd')
+sha256sums=('39e02b7f90a2665efe5483075f93b1c87d24f48070d5de783dd41e20d9eb0c7c')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-nv/PKGBUILD b/extra/xf86-video-nv/PKGBUILD
index 54c15d0e0..692363280 100644
--- a/extra/xf86-video-nv/PKGBUILD
+++ b/extra/xf86-video-nv/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 163675 2012-07-17 16:58:02Z andyrtr $
+# $Id: PKGBUILD 169436 2012-10-21 08:18:01Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer:Jan de Groot <jgc@archlinux.org>
pkgname=xf86-video-nv
pkgver=2.1.20
-pkgrel=1
+pkgrel=2
pkgdesc="X.org nv video driver"
arch=('i686' 'x86_64')
license=('custom')
url="http://xorg.freedesktop.org/"
depends=('glibc')
-makedepends=('xorg-server-devel>=1.11.99.903')
-conflicts=('xorg-server<1.11.99.903')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
options=('!libtool')
groups=('xorg-drivers' 'xorg')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/zeitgeist/PKGBUILD b/extra/zeitgeist/PKGBUILD
index 24b8d9fed..f5da6633b 100644
--- a/extra/zeitgeist/PKGBUILD
+++ b/extra/zeitgeist/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 162048 2012-06-19 07:36:41Z andrea $
+# $Id: PKGBUILD 169475 2012-10-21 21:14:01Z eric $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: György Balló <ballogy@freestart.hu>
pkgname=zeitgeist
-pkgver=0.9.0.1
+pkgver=0.9.5
pkgrel=1
pkgdesc="A service which logs the users's activities and events and makes relevant information available to other applications"
arch=('i686' 'x86_64')
url="http://zeitgeist-project.com/"
license=('GPL')
-depends=('python2-dbus' 'python2-gobject2' 'pyxdg' 'xapian-core')
+depends=('python2-dbus' 'python2-gobject2' 'python2-xdg' 'xapian-core')
makedepends=('intltool' 'raptor' 'python2-rdflib')
checkdepends=('vala')
-source=("https://launchpad.net/$pkgname/${pkgver%.*.*}/$pkgver/+download/$pkgname-$pkgver.tar.bz2"{,.asc})
-md5sums=('08f2eb384824e8458f18e10db7654965'
- '64486b3e6bec080c447c94f3ac2ff8e8')
+source=("https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.bz2")
+md5sums=('5841e4624b07ba74866fb177f1c9aae7')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -25,10 +24,10 @@ build() {
make
}
-#check() {
-# cd "$srcdir/$pkgname-$pkgver"
-# make check
-#}
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make -j1 check
+}
package() {
cd "$srcdir/$pkgname-$pkgver"
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-14 15:42:51 +0000