diff options
Diffstat (limited to 'extra')
49 files changed, 0 insertions, 2651 deletions
diff --git a/extra/avahi/ChangeLog b/extra/avahi/ChangeLog deleted file mode 100644 index 57984a3b2..000000000 --- a/extra/avahi/ChangeLog +++ /dev/null @@ -1,17 +0,0 @@ - -2009-04-23 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 0.6.25 - -2009-03-21 Eric Belanger <eric@archlinux.org> - - * Added optdepends for avahi-discover (close FS#11250) - -2009-01-04 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 0.6.24 - -2008-07-22 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 0.6.23 - diff --git a/extra/avidemux/2.5.4_audioDevice.patch b/extra/avidemux/2.5.4_audioDevice.patch deleted file mode 100644 index 9f1dd1e84..000000000 --- a/extra/avidemux/2.5.4_audioDevice.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- cmake/config.h.cmake.orig 2010-10-29 12:51:05.000000000 -0400 -+++ cmake/config.h.cmake 2010-10-29 12:51:48.000000000 -0400 -@@ -76,9 +76,7 @@ - /* use Nvwa memory leak detector */
- #cmakedefine FIND_LEAKS
-
--#if defined(OSS_SUPPORT) || defined (USE_ARTS) || defined(USE_SDL) || defined(__APPLE__) || defined(__WIN32) || defined(ALSA_SUPPORT)
- #define HAVE_AUDIO
--#endif
-
- #define HAVE_ENCODER
-
diff --git a/extra/avidemux/x264.patch b/extra/avidemux/x264.patch deleted file mode 100644 index 7200153d1..000000000 --- a/extra/avidemux/x264.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp ---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2010-10-10 06:45:42.000000000 -0700 -+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-01-16 07:16:48.283341102 -0800 -@@ -1386,7 +1386,7 @@ - case X264_WEIGHTP_NONE:
- strcpy((char*)xmlBuffer, "none");
- break;
-- case X264_WEIGHTP_BLIND:
-+ case X264_WEIGHTP_SIMPLE:
- strcpy((char*)xmlBuffer, "blind");
- break;
- case X264_WEIGHTP_SMART:
-@@ -1896,7 +1896,7 @@ - int weightedPredPFrames = X264_WEIGHTP_NONE;
-
- if (strcmp(content, "blind") == 0)
-- weightedPredPFrames = X264_WEIGHTP_BLIND;
-+ weightedPredPFrames = X264_WEIGHTP_SIMPLE;
- else if (strcmp(content, "smart") == 0)
- weightedPredPFrames = X264_WEIGHTP_SMART;
-
diff --git a/extra/clamav/clamav b/extra/clamav/clamav deleted file mode 100644 index 8e9c6afa9..000000000 --- a/extra/clamav/clamav +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/clamav ] && . /etc/conf.d/clamav - -PID_FC=`pidof -o %PPID /usr/bin/freshclam` -PID_CD=`pidof -o %PPID /usr/sbin/clamd` - -case "$1" in - start) - # if clamd isn't started first, notifyclamd fails at times - if [ "$START_CLAMD" == "yes" ]; then - stat_busy "Starting ClamD" - [ -z "$PID_CD" ] && /usr/sbin/clamd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon clamav - stat_done - fi - fi - - # give clamd enough time to start - sleep 1 - - if [ "$START_FRESHCLAM" == "yes" ]; then - stat_busy "Starting FreshClam" - [ -z "$PID_FC" ] && /usr/bin/freshclam -p /var/run/clamav/freshclam.pid -d $FRESHCLAM_OPTS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon clamav - stat_done - fi - fi - ;; - stop) - if [ "$START_CLAMD" == "yes" ]; then - stat_busy "Stopping ClamD" - [ -n "$PID_CD" ] && kill $PID_CD &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon clamav - stat_done - fi - fi - - if [ "$START_FRESHCLAM" == "yes" ]; then - stat_busy "Stopping FreshClam" - [ -n "$PID_FC" ] && kill $PID_FC &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon clamav - stat_done - fi - fi - ;; - restart) - $0 stop - # will not start if not fully stopped, so sleep - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/clamav/clamav.confd b/extra/clamav/clamav.confd deleted file mode 100644 index 9cd44d9f8..000000000 --- a/extra/clamav/clamav.confd +++ /dev/null @@ -1,8 +0,0 @@ -# clamav startup script config options - -# change these to "yes" to start -START_FRESHCLAM="no" -START_CLAMD="no" - -# Options to pass to freshclam (man freshclam for more info). -FRESHCLAM_OPTS="-c 12" diff --git a/extra/clamav/clamav.install b/extra/clamav/clamav.install deleted file mode 100644 index 9116dc394..000000000 --- a/extra/clamav/clamav.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null - getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null - - install -d /var/{log,run}/clamav - chown clamav:root /var/{log,run}/clamav - chown -R clamav:clamav /var/lib/clamav -} - -post_remove() { - getent passwd clamav &>/dev/null && userdel clamav >/dev/null - getent group clamav &>/dev/null && groupdel clamav >/dev/null - return 0 -} diff --git a/extra/clamav/clamav.logrotate b/extra/clamav/clamav.logrotate deleted file mode 100644 index d1dc94dce..000000000 --- a/extra/clamav/clamav.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/clamav/clamd.log /var/log/clamav/freshclam.log { - create 644 clamav clamav - sharedscripts - postrotate - /bin/kill -HUP `cat /var/run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true - /bin/kill -HUP `cat /var/run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true - endscript -} diff --git a/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch b/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch deleted file mode 100644 index a6514b550..000000000 --- a/extra/gtk3/only_draw_resize_grip_if_its_window_exists.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 847df205ede7f624c2bc4c4498495352cc865423 Mon Sep 17 00:00:00 2001 -From: Benjamin Otte <otte@redhat.com> -Date: Mon, 23 May 2011 13:46:59 +0000 -Subject: window: Only draw resize grip if its window exists - -Don't rely on priv->resize_grip_visible as the code comment in the -variable declaration indicates. -This fixes warnings with GtkPlug, which can cause resize_grip_visible to -be TRUE but grid_window to be NULL - running tests/teststatusicon -reproduces this. - -This broke with 0cf31b35eb10cb5bc08048ecdc141c949efec4cc ---- -diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c -index b97418a..b1caa9b 100644 ---- a/gtk/gtkwindow.c -+++ b/gtk/gtkwindow.c -@@ -7304,7 +7304,7 @@ gtk_window_draw (GtkWidget *widget, - if (GTK_WIDGET_CLASS (gtk_window_parent_class)->draw) - ret = GTK_WIDGET_CLASS (gtk_window_parent_class)->draw (widget, cr); - -- if (priv->resize_grip_visible && -+ if (priv->grip_window && - gtk_cairo_should_draw_window (cr, priv->grip_window)) - { - GdkRectangle rect; --- -cgit v0.9 diff --git a/extra/hugin/hugin-gcc46.patch b/extra/hugin/hugin-gcc46.patch deleted file mode 100644 index 98a70ad50..000000000 --- a/extra/hugin/hugin-gcc46.patch +++ /dev/null @@ -1,16 +0,0 @@ - -diff -r 0377a1af6110 -r 1fc6ad6e7c7a src/foreign/vigra/vigra/multi_iterator.hxx ---- a/src/foreign/vigra/vigra/multi_iterator.hxx Mon Jun 25 16:36:21 2007 +0000 -+++ b/src/foreign/vigra/vigra/multi_iterator.hxx Tue Jan 25 21:14:13 2011 +0000 -@@ -41,6 +41,7 @@ - #define VIGRA_MULTI_ITERATOR_HXX - - #include <sys/types.h> -+#include <stddef.h> - #include "tinyvector.hxx" - #include "iteratortags.hxx" - - - - - diff --git a/extra/icedtea-web/fix-man-location.patch b/extra/icedtea-web/fix-man-location.patch deleted file mode 100644 index 8108c7182..000000000 --- a/extra/icedtea-web/fix-man-location.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Makefile.am 2011-02-02 03:43:25.000000000 +0100 -+++ Makefile.am.new 2011-02-03 14:37:55.556053388 +0100 -@@ -130,8 +130,8 @@ - endif - - install-data-local: -- ${mkinstalldirs} -d $(DESTDIR)$(prefix)/man/man1 -- ${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(prefix)/man/man1 -+ ${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1 -+ ${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(mandir)/man1 - ${INSTALL_DATA} $(NETX_RESOURCE_DIR)/about.jnlp $(DESTDIR)$(prefix)$(JRE_DIR_PREFIX)/lib - if ENABLE_DOCS - ${mkinstalldirs} $(DESTDIR)$(htmldir) diff --git a/extra/icon-naming-utils/PKGBUILD b/extra/icon-naming-utils/PKGBUILD deleted file mode 100644 index 0fcffc493..000000000 --- a/extra/icon-naming-utils/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 33029 2009-04-03 21:35:27Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=icon-naming-utils -pkgver=0.8.90 -pkgrel=1 -pkgdesc="Maps the new names of icons for Tango to the legacy names used by the GNOME and KDE desktops." -arch=(i686 x86_64) -license=('GPL') -url="http://tango.freedesktop.org/" -depends=('perl-xml-simple') -source=(http://tango.freedesktop.org/releases/${pkgname}-${pkgver}.tar.bz2) -md5sums=('dd8108b56130b9eedc4042df634efa66') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/icon-naming-utils \ - --localstatedir=/var || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 - mv "${pkgdir}/usr/share/pkgconfig" "${pkgdir}/usr/lib/pkgconfig" || return 1 -} diff --git a/extra/libfm/0001-filename-with-spaces-not-supported.patch b/extra/libfm/0001-filename-with-spaces-not-supported.patch deleted file mode 100644 index 568f6dc38..000000000 --- a/extra/libfm/0001-filename-with-spaces-not-supported.patch +++ /dev/null @@ -1,345 +0,0 @@ -From 96fa31c757189c7c5f60d4de4c2df236d2cba0ea Mon Sep 17 00:00:00 2001 -From: Hong Jen Yee (PCMan) <pcman.tw@gmail.com> -Date: Wed, 20 Oct 2010 06:40:51 +0800 -Subject: [PATCH] Fix #3089625 - Filenames with spaces not supported in copy/paste. - ---- - src/base/fm-file-launcher.c | 2 +- - src/base/fm-folder.c | 6 +- - src/base/fm-path.c | 2 +- - src/gtk/fm-folder-view.c | 130 +++++++++++++++++++++--------------------- - src/gtk/fm-gtk-utils.c | 10 +-- - src/gtk/fm-path-entry.c | 2 +- - 6 files changed, 75 insertions(+), 77 deletions(-) - -diff --git a/src/base/fm-file-launcher.c b/src/base/fm-file-launcher.c -index 3857c33..c356249 100644 ---- a/src/base/fm-file-launcher.c -+++ b/src/base/fm-file-launcher.c -@@ -91,7 +91,7 @@ gboolean fm_launch_desktop_entry(GAppLaunchContext* ctx, const char* file_or_id, - * e.g: If this URL points to the another desktop entry file, and it - * points to yet another desktop entry file, this can create a - * infinite loop. This is a extremely rare case. */ -- FmPath* path = fm_path_new(url); -+ FmPath* path = fm_path_new_for_uri(url); - _uris = g_list_prepend(_uris, path); - ret = fm_launch_paths(ctx, _uris, launcher, user_data); - g_list_free(_uris); -diff --git a/src/base/fm-folder.c b/src/base/fm-folder.c -index ccbb3cc..3474937 100644 ---- a/src/base/fm-folder.c -+++ b/src/base/fm-folder.c -@@ -334,8 +334,8 @@ static void on_job_finished(FmDirListJob* job, FmFolder* folder) - - static FmJobErrorAction on_job_err(FmDirListJob* job, GError* err, FmJobErrorSeverity severity, FmFolder* folder) - { -- FmJobErrorAction ret; -- g_signal_emit(folder, signals[ERROR], 0, err, severity, &ret); -+ FmJobErrorAction ret; -+ g_signal_emit(folder, signals[ERROR], 0, err, severity, &ret); - return ret; - } - -@@ -470,7 +470,7 @@ FmFolder* fm_folder_get_for_path(FmPath* path) - - FmFolder* fm_folder_get_for_path_name(const char* path) - { -- FmPath* fm_path = fm_path_new(path); -+ FmPath* fm_path = fm_path_new_for_str(path); - FmFolder* folder = fm_folder_get_internal(fm_path, NULL); - fm_path_unref(fm_path); - return folder; -diff --git a/src/base/fm-path.c b/src/base/fm-path.c -index ca62256..8b31de2 100644 ---- a/src/base/fm-path.c -+++ b/src/base/fm-path.c -@@ -926,7 +926,7 @@ FmPathList* fm_path_list_new_from_uris(const char** uris) - FmPathList* pl = fm_path_list_new(); - for(uri = uris; *uri; ++uri) - { -- FmPath* path = fm_path_new(*uri); -+ FmPath* path = fm_path_new_for_uri(*uri); - fm_list_push_tail_noref(pl, path); - } - return pl; -diff --git a/src/gtk/fm-folder-view.c b/src/gtk/fm-folder-view.c -index fab88c0..9943015 100644 ---- a/src/gtk/fm-folder-view.c -+++ b/src/gtk/fm-folder-view.c -@@ -41,8 +41,8 @@ - - enum{ - CHDIR, -- LOADED, -- STATUS, -+ LOADED, -+ STATUS, - CLICKED, - SEL_CHANGED, - SORT_CHANGED, -@@ -82,7 +82,7 @@ static void fm_folder_view_class_init(FmFolderViewClass *klass) - { - GObjectClass *g_object_class; - GtkWidgetClass *widget_class; -- FmFolderViewClass *fv_class; -+ FmFolderViewClass *fv_class; - g_object_class = G_OBJECT_CLASS(klass); - g_object_class->finalize = fm_folder_view_finalize; - widget_class = GTK_WIDGET_CLASS(klass); -@@ -165,19 +165,19 @@ gboolean on_folder_view_focus_in(GtkWidget* widget, GdkEventFocus* evt) - - void on_chdir(FmFolderView* fv, FmPath* dir_path) - { -- GtkWidget* toplevel = gtk_widget_get_toplevel((GtkWidget*)fv); -- if(GTK_WIDGET_REALIZED(toplevel)) -- { -- GdkCursor* cursor = gdk_cursor_new(GDK_WATCH); -- gdk_window_set_cursor(toplevel->window, cursor); -- } -+ GtkWidget* toplevel = gtk_widget_get_toplevel((GtkWidget*)fv); -+ if(GTK_WIDGET_REALIZED(toplevel)) -+ { -+ GdkCursor* cursor = gdk_cursor_new(GDK_WATCH); -+ gdk_window_set_cursor(toplevel->window, cursor); -+ } - } - - void on_loaded(FmFolderView* fv, FmPath* dir_path) - { -- GtkWidget* toplevel = gtk_widget_get_toplevel((GtkWidget*)fv); -- if(GTK_WIDGET_REALIZED(toplevel)) -- gdk_window_set_cursor(toplevel->window, NULL); -+ GtkWidget* toplevel = gtk_widget_get_toplevel((GtkWidget*)fv); -+ if(GTK_WIDGET_REALIZED(toplevel)) -+ gdk_window_set_cursor(toplevel->window, NULL); - } - - void on_status(FmFolderView* fv, const char* msg) -@@ -187,15 +187,15 @@ void on_status(FmFolderView* fv, const char* msg) - - void on_model_loaded(FmFolderModel* model, FmFolderView* fv) - { -- FmFolder* folder = model->dir; -- char* msg; -- /* FIXME: prevent direct access to data members */ -- g_signal_emit(fv, signals[LOADED], 0, folder->dir_path); -+ FmFolder* folder = model->dir; -+ char* msg; -+ /* FIXME: prevent direct access to data members */ -+ g_signal_emit(fv, signals[LOADED], 0, folder->dir_path); - - /* FIXME: show number of hidden files and available disk spaces. */ -- msg = g_strdup_printf("%d files are listed.", fm_list_get_length(folder->files) ); -- g_signal_emit(fv, signals[STATUS], 0, msg); -- g_free(msg); -+ msg = g_strdup_printf("%d files are listed.", fm_list_get_length(folder->files) ); -+ g_signal_emit(fv, signals[STATUS], 0, msg); -+ g_free(msg); - } - - FmJobErrorAction on_folder_err(FmFolder* folder, GError* err, FmJobErrorSeverity severity, FmFolderView* fv) -@@ -326,8 +326,8 @@ static void fm_folder_view_finalize(GObject *object) - if( self->model ) - g_object_unref(self->model); - } -- g_object_unref(self->dnd_src); -- g_object_unref(self->dnd_dest); -+ g_object_unref(self->dnd_src); -+ g_object_unref(self->dnd_dest); - - if(self->cwd) - fm_path_unref(self->cwd); -@@ -715,15 +715,15 @@ void fm_folder_view_set_mode(FmFolderView* fv, FmFolderViewMode mode) - - /* FIXME: maybe calling set_icon_size here is a good idea */ - -- gtk_drag_source_set(fv->view, GDK_BUTTON1_MASK, -- fm_default_dnd_src_targets, N_FM_DND_SRC_DEFAULT_TARGETS, -- GDK_ACTION_COPY|GDK_ACTION_MOVE|GDK_ACTION_LINK|GDK_ACTION_ASK); -+ gtk_drag_source_set(fv->view, GDK_BUTTON1_MASK, -+ fm_default_dnd_src_targets, N_FM_DND_SRC_DEFAULT_TARGETS, -+ GDK_ACTION_COPY|GDK_ACTION_MOVE|GDK_ACTION_LINK|GDK_ACTION_ASK); - fm_dnd_src_set_widget(fv->dnd_src, fv->view); - -- gtk_drag_dest_set(fv->view, 0, -- fm_default_dnd_dest_targets, N_FM_DND_DEST_DEFAULT_TARGETS, -- GDK_ACTION_COPY|GDK_ACTION_MOVE|GDK_ACTION_LINK|GDK_ACTION_ASK); -- fm_dnd_dest_set_widget(fv->dnd_dest, fv->view); -+ gtk_drag_dest_set(fv->view, 0, -+ fm_default_dnd_dest_targets, N_FM_DND_DEST_DEFAULT_TARGETS, -+ GDK_ACTION_COPY|GDK_ACTION_MOVE|GDK_ACTION_LINK|GDK_ACTION_ASK); -+ fm_dnd_dest_set_widget(fv->dnd_dest, fv->view); - g_signal_connect_after(fv->view, "drag-motion", G_CALLBACK(on_drag_motion), fv); - g_signal_connect(fv->view, "drag-leave", G_CALLBACK(on_drag_leave), fv); - g_signal_connect(fv->view, "drag-drop", G_CALLBACK(on_drag_drop), fv); -@@ -739,9 +739,9 @@ void fm_folder_view_set_mode(FmFolderView* fv, FmFolderViewMode mode) - gtk_widget_grab_focus(fv->view); - } - else -- { -+ { - /* g_debug("same mode"); */ -- } -+ } - } - - FmFolderViewMode fm_folder_view_get_mode(FmFolderView* fv) -@@ -785,7 +785,7 @@ void fm_folder_view_sort(FmFolderView* fv, GtkSortType type, int by) - fv->sort_by = by; - if(fv->model) - gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(fv->model), -- fv->sort_by, fv->sort_type); -+ fv->sort_by, fv->sort_type); - } - - GtkSortType fm_folder_view_get_sort_type(FmFolderView* fv) -@@ -815,18 +815,18 @@ gboolean fm_folder_view_get_show_hidden(FmFolderView* fv) - - gboolean fm_folder_view_chdir_by_name(FmFolderView* fv, const char* path_str) - { -- gboolean ret; -- FmPath* path; -+ gboolean ret; -+ FmPath* path; - - if( G_UNLIKELY( !path_str ) ) - return FALSE; - -- path = fm_path_new(path_str); -- if(!path) /* might be a malformed path */ -- return FALSE; -- ret = fm_folder_view_chdir(fv, path); -- fm_path_unref(path); -- return ret; -+ path = fm_path_new_for_str(path_str); -+ if(!path) /* might be a malformed path */ -+ return FALSE; -+ ret = fm_folder_view_chdir(fv, path); -+ fm_path_unref(path); -+ return ret; - } - - static void on_folder_unmounted(FmFolder* folder, FmFolderView* fv) -@@ -912,10 +912,10 @@ gboolean fm_folder_view_chdir(FmFolderView* fv, FmPath* path) - } - } - -- /* FIXME: the signal handler should be able to cancel the loading. */ -- g_signal_emit(fv, signals[CHDIR], 0, path); -- if(fv->cwd) -- fm_path_unref(fv->cwd); -+ /* FIXME: the signal handler should be able to cancel the loading. */ -+ g_signal_emit(fv, signals[CHDIR], 0, path); -+ if(fv->cwd) -+ fm_path_unref(fv->cwd); - fv->cwd = fm_path_ref(path); - - fv->folder = folder = fm_folder_get_for_path(path); -@@ -1041,12 +1041,12 @@ gboolean on_btn_pressed(GtkWidget* view, GdkEventButton* evt, FmFolderView* fv) - if(!fv->model) - return FALSE; - -- /* FIXME: handle single click activation */ -+ /* FIXME: handle single click activation */ - if( evt->type == GDK_BUTTON_PRESS ) - { -- /* special handling for ExoIconView */ -- if(evt->button != 1) -- { -+ /* special handling for ExoIconView */ -+ if(evt->button != 1) -+ { - if(fv->mode==FM_FV_ICON_VIEW || fv->mode==FM_FV_COMPACT_VIEW || fv->mode==FM_FV_THUMBNAIL_VIEW) - { - /* select the item on right click for ExoIconView */ -@@ -1089,27 +1089,27 @@ gboolean on_btn_pressed(GtkWidget* view, GdkEventButton* evt, FmFolderView* fv) - gtk_tree_path_free(tp); - } - } -- } -+ } - -- if(evt->button == 2) /* middle click */ -- type = FM_FV_MIDDLE_CLICK; -- else if(evt->button == 3) /* right click */ -- type = FM_FV_CONTEXT_MENU; -+ if(evt->button == 2) /* middle click */ -+ type = FM_FV_MIDDLE_CLICK; -+ else if(evt->button == 3) /* right click */ -+ type = FM_FV_CONTEXT_MENU; - } - -- if( type != FM_FV_CLICK_NONE ) -- { -- sels = fm_folder_view_get_selected_tree_paths(fv); -- if( sels || type == FM_FV_CONTEXT_MENU ) -- { -- item_clicked(fv, sels ? sels->data : NULL, type); -- if(sels) -- { -- g_list_foreach(sels, (GFunc)gtk_tree_path_free, NULL); -- g_list_free(sels); -- } -- } -- } -+ if( type != FM_FV_CLICK_NONE ) -+ { -+ sels = fm_folder_view_get_selected_tree_paths(fv); -+ if( sels || type == FM_FV_CONTEXT_MENU ) -+ { -+ item_clicked(fv, sels ? sels->data : NULL, type); -+ if(sels) -+ { -+ g_list_foreach(sels, (GFunc)gtk_tree_path_free, NULL); -+ g_list_free(sels); -+ } -+ } -+ } - return FALSE; - } - -diff --git a/src/gtk/fm-gtk-utils.c b/src/gtk/fm-gtk-utils.c -index 23b6f33..07df7d5 100644 ---- a/src/gtk/fm-gtk-utils.c -+++ b/src/gtk/fm-gtk-utils.c -@@ -149,7 +149,7 @@ FmPath* fm_get_user_input_path(GtkWindow* parent, const char* title, const char* - } - - str = _fm_user_input_dialog_run( dlg, GTK_ENTRY( entry ) ); -- path = fm_path_new(str); -+ path = fm_path_new_for_str(str); - - g_free(path_str); - g_free(str); -@@ -261,11 +261,9 @@ FmPath* fm_select_folder(GtkWindow* parent) - GTK_RESPONSE_OK, NULL); - if( gtk_dialog_run((GtkDialog*)chooser) == GTK_RESPONSE_OK ) - { -- char* file = gtk_file_chooser_get_filename(chooser); -- if(!file) -- file = gtk_file_chooser_get_uri(chooser); -- path = fm_path_new(file); -- g_free(file); -+ GFile* file = gtk_file_chooser_get_file(chooser); -+ path = fm_path_new_for_gfile(file); -+ g_object_unref(file); - } - else - path = NULL; -diff --git a/src/gtk/fm-path-entry.c b/src/gtk/fm-path-entry.c -index a57b58d..af60d03 100644 ---- a/src/gtk/fm-path-entry.c -+++ b/src/gtk/fm-path-entry.c -@@ -163,7 +163,7 @@ static void fm_path_entry_changed(GtkEditable *editable) - if( !fm_path_equal_str(priv->path, original_key, key_dir_len) ) - { - gchar* new_path = g_path_get_dirname(original_key); -- FmPath *new_fm_path = fm_path_new(new_path); -+ FmPath *new_fm_path = fm_path_new_for_str(new_path); - g_free(new_path); - if( new_fm_path != NULL ) - { --- -1.7.0.1 - - diff --git a/extra/libfm/PKGBUILD b/extra/libfm/PKGBUILD deleted file mode 100644 index ea61503c9..000000000 --- a/extra/libfm/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 119892 2011-04-16 12:10:54Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> -pkgname=libfm -pkgver=0.1.14 -pkgrel=5 -pkgdesc="the core of next generation file manager PCManFM" -url="http://pcmanfm.sourceforge.net/" -arch=('i686' 'x86_64') -license=('GPL') -groups=('lxde') -options=('!libtool') -install=libfm.install -depends=('gtk2' 'menu-cache' 'shared-mime-info' 'udisks') -source=(http://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.gz - 0001-filename-with-spaces-not-supported.patch) -md5sums=('d55e51dced6bb9ef46665243b079761f' - '22bf07665db6eb82989cc8111ef5c3bf') - -build() { - cd $srcdir/$pkgname-$pkgver - patch -p1 -i $srcdir/0001-filename-with-spaces-not-supported.patch - ./configure --prefix=/usr --sysconfdir=/etc --enable-udisks --with-gnu-ld - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} diff --git a/extra/libfm/libfm.install b/extra/libfm/libfm.install deleted file mode 100644 index 076da308e..000000000 --- a/extra/libfm/libfm.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - usr/bin/update-mime-database usr/share/mime > /dev/null - usr/bin/update-desktop-database -q - usr/bin/gio-querymodules usr/lib/gio/modules -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - - diff --git a/extra/libwebkit/gcc46.patch b/extra/libwebkit/gcc46.patch deleted file mode 100644 index befd892d4..000000000 --- a/extra/libwebkit/gcc46.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: trunk/Source/WebCore/dom/make_names.pl
-===================================================================
---- trunk/Source/WebCore/dom/make_names.pl (revision 73989)
-+++ trunk/Source/WebCore/dom/make_names.pl (revision 84123)
-@@ -66,5 +66,5 @@
- $gccLocation = "/usr/bin/gcc";
- }
--my $preprocessor = $gccLocation . " -E -P -x c++";
-+my $preprocessor = $gccLocation . " -E -x c++";
-
- GetOptions(
diff --git a/extra/lxde-common/PKGBUILD b/extra/lxde-common/PKGBUILD deleted file mode 100644 index 761841bb7..000000000 --- a/extra/lxde-common/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> -pkgname=lxde-common -pkgver=0.5.0 -pkgrel=3 -pkgdesc="Common files of the LXDE Desktop" -arch=('i686' 'x86_64') -license=('GPL2') -groups=('lxde') -depends=('libx11' 'glib2' 'lxde-icon-theme') -url="http://lxde.org/" -# startlxde is useless without lxsession -makedepends=(automake) -optdepends=(lxsession-lite) -backup=(etc/xdg/lxsession/LXDE/{desktop.conf,autostart}) -source=("http://downloads.sourceforge.net/project/lxde/${pkgname}%20%28default%20config%29/${pkgname}%200.5.0/${pkgname}-0.5.0.tar.gz" "${pkgname}-arch.patch" ${pkgname}-invalid-distfile.patch) -md5sums=('23606ab3d6e1039386d62a4b68b4ffc6' '21657157d9ab377de55deb19a42d68e8'\ - '24938631783683fd98dfd533023e6d4e') - - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i ${srcdir}/${pkgname}-arch.patch - autoreconf - ./configure --sysconfdir=/etc --prefix=/usr - make DESTDIR="$pkgdir" install - install -Dm644 lxde-logout.desktop ${pkgdir}/usr/share/applications/lxde-logout.desktop -} - diff --git a/extra/lxde-common/lxde-common-arch.patch b/extra/lxde-common/lxde-common-arch.patch deleted file mode 100644 index 3aa1a8992..000000000 --- a/extra/lxde-common/lxde-common-arch.patch +++ /dev/null @@ -1,186 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index ba4149c..61cf4c5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -31,9 +31,9 @@ openbox_DATA= \ - openbox/rc.xml \ - openbox/menu.xml - --pcmanfmdir=$(datadir)/lxde/pcmanfm -+pcmanfmdir=$(sysconfdir)/xdg/pcmanfm - pcmanfm_DATA= \ -- pcmanfm/main.lxde -+ pcmanfm/lxde.conf - - EXTRA_DIST = \ - autostart \ -@@ -45,7 +45,7 @@ EXTRA_DIST = \ - openbox/rc.xml.in \ - openbox/menu.xml \ - openbox-lxde.in \ -- pcmanfm/main.lxde.in \ -+ pcmanfm/lxde.conf.in \ - $(lxpanel_DATA) \ - lxpanel/panel.in - -diff --git a/autostart b/autostart -index 17d7b58..d5b6514 100644 ---- a/autostart -+++ b/autostart -@@ -1,3 +1,3 @@ --@xscreensaver -no-splash - @lxpanel --profile LXDE --@pcmanfm -d -+@pcmanfm --desktop --profile lxde -+@xscreensaver -no-splash -diff --git a/configure.ac b/configure.ac -index 3b62903..f90b4c5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,5 +1,5 @@ - AC_PREREQ([2.57]) --AC_INIT(lxde-common,[0.5.0], [],lxde-common) -+AC_INIT(lxde-common,[0.5.5], [],lxde-common) - AM_INIT_AUTOMAKE() - dnl AC_PROG_INTLTOOL(, [no-xml]) - dnl AM_MAINTAINER_MODE -@@ -48,7 +48,16 @@ AC_OUTPUT([ - lxpanel/panel - openbox/rc.xml - openbox-lxde -- pcmanfm/main.lxde -+ pcmanfm/lxde.conf - man/Makefile - ]) - -+if test x"$sysconfdir" != x'/etc'; then -+ echo -+ echo -+ echo 'Error: sysconfdir is not /etc.' -+ echo 'Please consider passing --sysconfdir=/etc to configure.'; -+ echo 'Otherwise default config files will be installed to wrong place.' -+ echo -+ echo -+fi -diff --git a/lxpanel/config b/lxpanel/config -index 1911551..cb7f06d 100644 ---- a/lxpanel/config -+++ b/lxpanel/config -@@ -1,4 +1,4 @@ - [Command] - FileManager=pcmanfm %s --Terminal=xterm -e -+Terminal=lxterminal - Logout=lxde-logout -diff --git a/openbox-lxde b/openbox-lxde -old mode 100755 -new mode 100644 -diff --git a/openbox/menu.xml b/openbox/menu.xml -index 78099e6..a7768a5 100644 ---- a/openbox/menu.xml -+++ b/openbox/menu.xml -@@ -25,7 +25,7 @@ - <item label="Desktop Settings"> - <action name="Execute"> - <startupnotify><enabled>yes</enabled></startupnotify> -- <command>pcmanfm --show-pref 2</command> -+ <command>pcmanfm --desktop-pref</command> - </action> - </item> - <item label="Window Management Settings"> -@@ -43,4 +43,4 @@ - </item> - </menu> - --</openbox_menu> -\ No newline at end of file -+</openbox_menu> -diff --git a/pcmanfm/lxde.conf.in b/pcmanfm/lxde.conf.in -new file mode 100644 -index 0000000..6799e1f ---- /dev/null -+++ b/pcmanfm/lxde.conf.in -@@ -0,0 +1,20 @@ -+[config] -+bm_open_method=0 -+su_cmd=xdg-su -c '%s' -+ -+[desktop] -+wallpaper_mode=1 -+wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg -+desktop_bg=#000000 -+desktop_fg=#ffffff -+desktop_shadow=#000000 -+ -+[ui] -+always_show_tabs=0 -+hide_close_btn=0 -+win_width=640 -+win_height=480 -+view_mode=0 -+show_hidden=0 -+sort_type=0 -+sort_by=0 -diff --git a/pcmanfm/main.lxde.in b/pcmanfm/main.lxde.in -deleted file mode 100644 -index a619852..0000000 ---- a/pcmanfm/main.lxde.in -+++ /dev/null -@@ -1,3 +0,0 @@ --[Desktop] --show_wallpaper=1 --wallpaper=@prefix@/share/lxde/wallpapers/lxde_blue.jpg -diff --git a/startlxde.in b/startlxde.in -index 8372d3a..f493e28 100755 ---- a/startlxde.in -+++ b/startlxde.in -@@ -1,28 +1,43 @@ - #!/bin/sh - - if [ -z "$XDG_CONFIG_HOME" ]; then -- export XDG_CONFIG_HOME="$HOME/.config" -+ export XDG_CONFIG_HOME="$HOME/.config" - fi - - # Ensure the existance of pcmanfm config file - PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm" --if [ ! -f "$PCMANFM_CONF_DIR/main.lxde" ]; then -- mkdir -p "$PCMANFM_CONF_DIR" -- cp @prefix@/share/lxde/pcmanfm/main.lxde "$PCMANFM_CONF_DIR/main.lxde" -+if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then -+ mkdir -p "$PCMANFM_CONF_DIR" -+ cp @prefix@/share/lxde/pcmanfm/pcmanfm.conf "$PCMANFM_CONF_DIR/pcmanfm.conf" - fi - - # Ensure the existance of openbox config file - OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox" - if [ ! -f "$OPENBOX_CONF_DIR/lxde-rc.xml" ]; then -- mkdir -p "$OPENBOX_CONF_DIR" -- cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml" -+ mkdir -p "$OPENBOX_CONF_DIR" -+ cp @prefix@/share/lxde/openbox/rc.xml "$OPENBOX_CONF_DIR/lxde-rc.xml" - fi - -+# Ensure the existance of the 'Desktop' folder -+if [ -e "$XDG_CONFIG_HOME/user-dirs.dirs" ]; then -+ . "$XDG_CONFIG_HOME/user-dirs.dirs" -+else -+ XDG_DESKTOP_DIR="$HOME/Desktop" -+fi -+mkdir -p "$XDG_DESKTOP_DIR" -+ - # Clean up after GDM (GDM sets the number of desktops to one) - xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null - - # Enable GTK+2 integration for OpenOffice.org, if available. - export SAL_USE_VCLPLUGIN=gtk - -+# Launch DBus if needed -+if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then -+ eval "$(dbus-launch --sh-syntax --exit-with-session)" -+fi -+ -+export XDG_MENU_PREFIX="lxde-" -+ - # Start the LXDE session - exec @prefix@/bin/lxsession -s LXDE -e LXDE diff --git a/extra/lxde-common/lxde-common-invalid-distfile.patch b/extra/lxde-common/lxde-common-invalid-distfile.patch deleted file mode 100644 index df5d68084..000000000 --- a/extra/lxde-common/lxde-common-invalid-distfile.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -ub lxde-common-0.5.0.dist/startlxde.in lxde-common-0.5.0/startlxde.in ---- lxde-common-0.5.0.dist/startlxde.in 2009-09-04 11:46:53.000000000 +0200 -+++ lxde-common-0.5.0./startlxde.in 2010-01-18 21:47:18.000000000 +0100 -@@ -25,4 +25,4 @@ - export SAL_USE_VCLPLUGIN=gtk - - # Start the LXDE session --exec @prefix@/bin/lxsession -s LXDE -+exec @prefix@/bin/lxsession -s LXDE -e LXDE - diff --git a/extra/lxde-common/lxde-common.install b/extra/lxde-common/lxde-common.install deleted file mode 100644 index 86a366848..000000000 --- a/extra/lxde-common/lxde-common.install +++ /dev/null @@ -1,18 +0,0 @@ -ICON_PATH=usr/share/icons/nuoveXT2 - -post_install() { - gtk-update-icon-cache -q -t -f ${ICON_PATH} -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - gtk-update-icon-cache -q -t -f ${ICON_PATH} -} - -op=$1 -shift - -$op $* diff --git a/extra/lxdm/PKGBUILD b/extra/lxdm/PKGBUILD deleted file mode 100644 index a0b1d9628..000000000 --- a/extra/lxdm/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -#Contributor: kiefer <jorgelmadrid@gmail.com> -#Based on lxdm-git by phillipe - -pkgname=lxdm -pkgver=0.3.0 -pkgrel=1 -pkgdesc="Lightweight Display Manager (part of LXDE)" -arch=('i686' 'x86_64') -url="http://sourceforge.net/projects/lxdm/" -license=('GPL') -groups=('lxde') -conflicts=('lxdm-git') -depends=('gtk2' 'xorg-server' 'consolekit') -makedepends=('intltool') -install=${pkgname}.install -backup=('etc/lxdm/lxdm.conf') # 'etc/lxdm/xinitrc') -source=(http://downloads.sourceforge.net/project/lxdm/lxdm%20${pkgver}/$pkgname-$pkgver.tar.gz - Xsession.patch lxdm.patch lxdm-pam.patch lxdm-daemon) -md5sums=('1d0688e088edab7c3c563263eb2f9654' - '9bdf95adb74d81d4b6b6176fb1142090' - 'baed9055e8825a5511712bc095197519' - 'b20fe3c8487a039050986d60e45233a9' - '705f394052fdd0dec22e95321d170de0') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm - make - - patch -Np0 < ../lxdm.patch - patch -Np0 < ../Xsession.patch -} - - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR="${pkgdir}" install || return 1 - - install -m644 ${srcdir}/lxdm-pam.patch ${pkgdir}/etc/pam.d/lxdm || return 1 - install -Dm755 ${srcdir}/lxdm-daemon ${pkgdir}/etc/rc.d/lxdm || return 1 - - # these files are not in the package, but should be owned by lxdm - taken from Fedora pkg -# touch ${pkgdir}/etc/lxdm/xinitrc - mkdir -p ${pkgdir}/var/run/lxdm - mkdir -p ${pkgdir}/var/lib/lxdm -# touch ${pkgdir}/var/lib/lxdm/lxdm.conf - - # fix the greeter location - sed -i -e "s/libexec/lib\/lxdm/" ${pkgdir}/etc/lxdm/lxdm.conf -} diff --git a/extra/lxdm/Xsession.patch b/extra/lxdm/Xsession.patch deleted file mode 100644 index a9ba63233..000000000 --- a/extra/lxdm/Xsession.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- data/Xsession.orig 2010-01-31 20:48:08.695677408 -0200 -+++ data/Xsession 2010-01-31 20:47:48.260223292 -0200 -@@ -2,6 +2,11 @@ - - # use bash for "exec -l", howto run login shell by /bin/sh ? - -+[[ -f /etc/profile ]] && . /etc/profile -+[[ -f "$HOME/.profile" ]] && . "$HOME/.profile" -+[[ -f /etc/xprofile ]] && . /etc/xprofile -+[[ -f "$HOME/.xprofile" ]] && . "$HOME/.xprofile" -+ - if [ $# -eq 1 -a -n "$1" ]; then - LXSESSION=$1 - else diff --git a/extra/lxdm/lxdm-daemon b/extra/lxdm/lxdm-daemon deleted file mode 100644 index 68eb6225d..000000000 --- a/extra/lxdm/lxdm-daemon +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID `which lxdm-binary`) -case "$1" in - start) - stat_busy "Starting LXDM Display Manager" - [ -z "$PID" ] && /usr/sbin/lxdm -d &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon lxdm - stat_done - fi - ;; - stop) - stat_busy "Stopping LXDM Display Manager" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon lxdm - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/lxdm/lxdm-pam.patch b/extra/lxdm/lxdm-pam.patch deleted file mode 100644 index 3f5df04a7..000000000 --- a/extra/lxdm/lxdm-pam.patch +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so -account required pam_unix.so -session required pam_limits.so -session required pam_unix.so -password required pam_unix.so diff --git a/extra/lxdm/lxdm.install b/extra/lxdm/lxdm.install deleted file mode 100644 index 8d42de90f..000000000 --- a/extra/lxdm/lxdm.install +++ /dev/null @@ -1,59 +0,0 @@ -pkgname=lxdm - -post_install() { - # make sure the group and user "lxdm" exist on this system and have the correct values - if grep -q "^lxdm:" /etc/group &> /dev/null ; then - groupmod -g 121 -n lxdm lxdm &> /dev/null - else - groupadd -g 121 lxdm &> /dev/null - fi - - if grep -q "^lxdm:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "LXDE Display Manager user" -d /var/lib/lxdm -u 121 -g lxdm lxdm &> /dev/null - else - useradd -s /sbin/nologin -c "LXDE Display Manager user" -d /var/lib/lxdm -u 121 -g lxdm -m -r lxdm &> /dev/null - fi - passwd -l lxdm > /dev/null - -# chown root:lxdm /etc/lxdm/{lxdm.conf,xinitrc} > /dev/null - chown root:lxdm /etc/lxdm/lxdm.conf > /dev/null - chown -R root:lxdm /var/lib/lxdm > /dev/null - chown -R root:lxdm /var/run/lxdm > /dev/null - -cat << EOF ->>> To make the LXDM as your default DM, ->>> put, 'lxdm' or '@lxdm' (without quotes) on DAEMONS in /etc/rc.conf ->>> ->>> You can also use /etc/inittab, ->>> just add 'x:5:respawn:/usr/sbin/lxdm >& /dev/null' (without quotes) ->>> in the end of the file /etc/inittab ->>> and uncoment the line on the top 'id:5:initdefault:'. -EOF -} - -post_upgrade() { - # make sure the group and user "lxdm" exist on this system and have the correct values - if grep -q "^lxdm:" /etc/group &> /dev/null ; then - groupmod -g 121 -n lxdm lxdm &> /dev/null - else - groupadd -g 121 lxdm &> /dev/null - fi - - if grep -q "^lxdm:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "LXDE Display Manager user" -d /var/lib/lxdm -u 121 -g lxdm lxdm &> /dev/null - else - useradd -s /sbin/nologin -c "LXDE Display Manager user" -d /var/lib/lxdm -u 121 -g lxdm -m -r lxdm &> /dev/null - fi - passwd -l lxdm > /dev/null - -# chown root:lxdm /etc/lxdm/{lxdm.conf,xinitrc} > /dev/null - chown root:lxdm /etc/lxdm/lxdm.conf > /dev/null - chown -R root:lxdm /var/lib/lxdm > /dev/null - chown -R root:lxdm /var/run/lxdm > /dev/null -} - -post_remove() { - # Removing lxdm group+user - getent passwd lxdm >/dev/null 2>&1 && userdel lxdm #|| /bin/true - getent group lxdm >/dev/null 2>&1 && groupdel lxdm #|| /bin/true -} diff --git a/extra/lxdm/lxdm.patch b/extra/lxdm/lxdm.patch deleted file mode 100644 index a703a386d..000000000 --- a/extra/lxdm/lxdm.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- data/lxdm.orig 2010-01-24 16:58:42.262866825 -0200 -+++ data/lxdm 2010-01-19 11:56:34.308668692 -0200 -@@ -1,21 +1,13 @@ - #!/bin/sh - --[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n -- --if [ -z "$LANG" -a -e /etc/sysconfig/language ]; then -- . /etc/sysconfig/language -- if [ -n "$RC_LANG"]; then -- LANG=$RC_LANG -- fi -+if [ -r /etc/profile.d/locale.sh ]; then -+ . /etc/profile.d/locale.sh - fi - - if [ -n "$LANG" ]; then - export LANG - fi - --[ -f /etc/sysconfig/desktop ] && . /etc/sysconfig/desktop --[ -f /etc/sysconfig/windowmanager ] && . /etc/sysconfig/windowmanager -- - if [ -n "$DEFAULT_WM" ]; then - PREFERRED=$DEFAULT_WM - fi diff --git a/extra/lxmenu-data/PKGBUILD b/extra/lxmenu-data/PKGBUILD deleted file mode 100644 index eff65fe89..000000000 --- a/extra/lxmenu-data/PKGBUILD +++ /dev/null @@ -1,19 +0,0 @@ -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> -pkgname=lxmenu-data -pkgver=0.1.1 -pkgrel=1 -pkgdesc="freedesktop.org desktop menus for LXDE" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://lxde.org/" -groups=('lxde') -source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz) -md5sums=('cee3181dd22088f3db0e99ffbedc986d') - -build() { -cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc || return 1 - make || return 1 - make DESTDIR="$pkgdir" install || return 1 -} - diff --git a/extra/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch b/extra/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch deleted file mode 100644 index e3da3d897..000000000 --- a/extra/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 4a974f2686d2fafdcda4a180b0483a7b17fd2d71 Mon Sep 17 00:00:00 2001 -From: Marty Jack <martyj@linux.local> -Date: Thu, 22 Jul 2010 19:46:13 -0400 -Subject: [PATCH 3/3] Fix build issue with symbol "alarm" showing up on F14 (Bug3033293) - ---- - src/plugins/batt/batt.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/plugins/batt/batt.c b/src/plugins/batt/batt.c -index 288231f..05c0deb 100644 ---- a/src/plugins/batt/batt.c -+++ b/src/plugins/batt/batt.c -@@ -95,7 +95,7 @@ typedef struct { - typedef struct { - char *command; - sem_t *lock; --} alarm; -+} Alarm; - - static void destructor(Plugin *p); - static void update_display(lx_battery *lx_b, gboolean repaint); -@@ -103,7 +103,7 @@ static void update_display(lx_battery *lx_b, gboolean repaint); - /* alarmProcess takes the address of a dynamically allocated alarm struct (which - it must free). It ensures that alarm commands do not run concurrently. */ - static void * alarmProcess(void *arg) { -- alarm *a = (alarm *) arg; -+ Alarm *a = (Alarm *) arg; - - sem_wait(a->lock); - system(a->command); -@@ -157,7 +157,7 @@ void update_display(lx_battery *lx_b, gboolean repaint) { - /* Run the alarm command if it isn't already running */ - if (alarmCanRun) { - -- alarm *a = (alarm *) malloc(sizeof(alarm)); -+ Alarm *a = (Alarm *) malloc(sizeof(Alarm)); - a->command = lx_b->alarmCommand; - a->lock = &(lx_b->alarmProcessLock); - --- -1.7.1.1 - diff --git a/extra/lxpanel/Fix-failure-to-react-to-keyboard-map-changes-initiat.patch b/extra/lxpanel/Fix-failure-to-react-to-keyboard-map-changes-initiat.patch deleted file mode 100644 index b5483e7b0..000000000 --- a/extra/lxpanel/Fix-failure-to-react-to-keyboard-map-changes-initiat.patch +++ /dev/null @@ -1,555 +0,0 @@ -From 438d9fdbd3e0be04de933705917d508a02b7c04b Mon Sep 17 00:00:00 2001 -From: Marty Jack <martyj@linux.local> -Date: Sat, 20 Feb 2010 16:23:57 -0500 -Subject: [PATCH 4/5] Fix failure to react to keyboard map changes initiated outside the plugin - - Occurred when setxkbmap was run, or when HAL configured the keyboard at X startup - - Caused by failure to process the NewKeyboard event - - Caused by dropping events due to faulty code to read them - - Cosmetic change, the tooltip now the Xkb Group name rather than Xkb Symbol name - ---- - src/plugins/xkb/xkb-plugin.c | 92 +++++++++-------- - src/plugins/xkb/xkb.c | 236 +++++++++++++++++++++-------------------- - src/plugins/xkb/xkb.h | 7 +- - 3 files changed, 173 insertions(+), 162 deletions(-) - -diff --git a/src/plugins/xkb/xkb-plugin.c b/src/plugins/xkb/xkb-plugin.c -index f49a77d..80a14ba 100644 ---- a/src/plugins/xkb/xkb-plugin.c -+++ b/src/plugins/xkb/xkb-plugin.c -@@ -1,18 +1,23 @@ --/* --//==================================================================== --// xfce4-xkb-plugin - XFCE4 Xkb Layout Indicator panel plugin --// ------------------------------------------------------------------- --// Alexander Iliev <sasoiliev@mamul.org> --// 20-Feb-04 --// ------------------------------------------------------------------- --// Parts of this code belong to Michael Glickman <wmalms@yahooo.com> --// and his program wmxkb. --// WARNING: DO NOT BOTHER Michael Glickman WITH QUESTIONS ABOUT THIS --// PROGRAM!!! SEND INSTEAD EMAILS TO <sasoiliev@mamul.org> --//==================================================================== --*/ -- --/* Modified by Hong Jen Yee (PCMan) <pcman.tw@gmail.com> on 2008-04-06 for lxpanel */ -+/** -+ * Copyright (c) 2010 LxDE Developers, see the file AUTHORS for details. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ */ -+ -+/* Originally derived from xfce4-xkb-plugin, Copyright 2004 Alexander Iliev, -+ * which credits Michael Glickman. */ - - #ifdef HAVE_CONFIG_H - #include <config.h> -@@ -49,38 +54,45 @@ void xkb_redraw(XkbPlugin * xkb) - if (xkb->display_type == IMAGE) - { - int size = xkb->plugin->panel->icon_size; -- char * group_name = (char *) xkb_get_current_group_name_lowercase(xkb); -- char * filename = g_strdup_printf("%s/%s.png", FLAGSDIR, group_name); -- GdkPixbuf * unscaled_pixbuf = gdk_pixbuf_new_from_file(filename, NULL); -- g_free(filename); -- g_free(group_name); -- -- if (unscaled_pixbuf != NULL) -+ char * group_name = (char *) xkb_get_current_symbol_name_lowercase(xkb); -+ if (group_name != NULL) - { -- /* Loaded successfully. */ -- int width = gdk_pixbuf_get_width(unscaled_pixbuf); -- int height = gdk_pixbuf_get_height(unscaled_pixbuf); -- GdkPixbuf * pixbuf = gdk_pixbuf_scale_simple(unscaled_pixbuf, size * width / height, size, GDK_INTERP_BILINEAR); -- if (pixbuf != NULL) -+ char * filename = g_strdup_printf("%s/%s.png", FLAGSDIR, group_name); -+ GdkPixbuf * unscaled_pixbuf = gdk_pixbuf_new_from_file(filename, NULL); -+ g_free(filename); -+ g_free(group_name); -+ -+ if (unscaled_pixbuf != NULL) - { -- gtk_image_set_from_pixbuf(GTK_IMAGE(xkb->image), pixbuf); -- g_object_unref(G_OBJECT(pixbuf)); -- gtk_widget_hide(xkb->label); -- gtk_widget_show(xkb->image); -- gtk_widget_set_tooltip_text(xkb->btn, xkb_get_current_group_name(xkb)); -- valid_image = TRUE; -+ /* Loaded successfully. */ -+ int width = gdk_pixbuf_get_width(unscaled_pixbuf); -+ int height = gdk_pixbuf_get_height(unscaled_pixbuf); -+ GdkPixbuf * pixbuf = gdk_pixbuf_scale_simple(unscaled_pixbuf, size * width / height, size, GDK_INTERP_BILINEAR); -+ if (pixbuf != NULL) -+ { -+ gtk_image_set_from_pixbuf(GTK_IMAGE(xkb->image), pixbuf); -+ g_object_unref(G_OBJECT(pixbuf)); -+ gtk_widget_hide(xkb->label); -+ gtk_widget_show(xkb->image); -+ gtk_widget_set_tooltip_text(xkb->btn, xkb_get_current_group_name(xkb)); -+ valid_image = TRUE; -+ } -+ g_object_unref(unscaled_pixbuf); - } -- g_object_unref(unscaled_pixbuf); - } - } - - /* Set the label. */ - if ((xkb->display_type == TEXT) || ( ! valid_image)) - { -- panel_draw_label_text(xkb->plugin->panel, xkb->label, (char *) xkb_get_current_group_name(xkb), TRUE, TRUE); -- gtk_widget_hide(xkb->image); -- gtk_widget_show(xkb->label); -- gtk_widget_set_tooltip_text(xkb->btn, NULL); -+ char * group_name = (char *) xkb_get_current_symbol_name(xkb); -+ if (group_name != NULL) -+ { -+ panel_draw_label_text(xkb->plugin->panel, xkb->label, (char *) group_name, TRUE, TRUE); -+ gtk_widget_hide(xkb->image); -+ gtk_widget_show(xkb->label); -+ gtk_widget_set_tooltip_text(xkb->btn, xkb_get_current_group_name(xkb)); -+ } - } - } - -@@ -196,10 +208,6 @@ static int xkb_constructor(Plugin * plugin, char ** fp) - /* Initialize the XKB interface. */ - xkb_mechanism_constructor(xkb); - -- /* Initialize a channel to listen for XKB events. */ -- GIOChannel * channel = g_io_channel_unix_new(xkb_get_connection_number(xkb)); -- xkb->source_id = g_io_add_watch(channel, G_IO_IN | G_IO_PRI, (GIOFunc) xkb_gio_callback, (gpointer) xkb); -- - /* Connect signals. */ - g_signal_connect(xkb->btn, "button-press-event", G_CALLBACK(xkb_button_press_event), xkb); - g_signal_connect(xkb->btn, "scroll-event", G_CALLBACK(xkb_scroll_event), xkb); -diff --git a/src/plugins/xkb/xkb.c b/src/plugins/xkb/xkb.c -index 5bb0c39..898a931 100644 ---- a/src/plugins/xkb/xkb.c -+++ b/src/plugins/xkb/xkb.c -@@ -1,18 +1,23 @@ --/* --// ==================================================================== --// xfce4-xkb-plugin - XFCE4 Xkb Layout Indicator panel plugin --// ------------------------------------------------------------------- --// Alexander Iliev <sasoiliev@mamul.org> --// 20-Feb-04 --// ------------------------------------------------------------------- --// Parts of this code belong to Michael Glickman <wmalms@yahooo.com> --// and his program wmxkb. --// WARNING: DO NOT BOTHER Michael Glickman WITH QUESTIONS ABOUT THIS --// PROGRAM!!! SEND INSTEAD EMAILS TO <sasoiliev@mamul.org> --//==================================================================== --*/ -- --/* Modified by Hong Jen Yee (PCMan) <pcman.tw@gmail.com> on 2008-04-06 for lxpanel */ -+/** -+ * Copyright (c) 2010 LxDE Developers, see the file AUTHORS for details. -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software Foundation, -+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ */ -+ -+/* Originally derived from xfce4-xkb-plugin, Copyright 2004 Alexander Iliev, -+ * which credits Michael Glickman. */ - - #include "xkb.h" - -@@ -26,9 +31,13 @@ - #include <gdk-pixbuf/gdk-pixbuf.h> - #include <glib.h> - -+/* The X Keyboard Extension: Library Specification -+ * http://www.xfree86.org/current/XKBlib.pdf */ -+ - static void xkb_enter_locale_by_process(XkbPlugin * xkb); - static void refresh_group_xkb(XkbPlugin * xkb); --static int do_init_xkb(XkbPlugin * xkb); -+static int initialize_keyboard_description(XkbPlugin * xkb); -+static GdkFilterReturn xkb_event_filter(GdkXEvent * xevent, GdkEvent * event, XkbPlugin * xkb); - - /* Insert a process and its layout into the hash table. */ - static void xkb_enter_locale_by_process(XkbPlugin * xkb) -@@ -56,60 +65,65 @@ int xkb_get_group_count(XkbPlugin * xkb) - return xkb->group_count; - } - -+/* Get the current group name. */ -+const char * xkb_get_current_group_name(XkbPlugin * xkb) -+{ -+ return xkb->group_names[xkb->current_group_xkb_no]; -+} -+ - /* Convert a group number to a symbol name. */ - const char * xkb_get_symbol_name_by_res_no(XkbPlugin * xkb, int n) - { - return xkb->symbol_names[n]; - } - --/* Get the current group name. */ --const char * xkb_get_current_group_name(XkbPlugin * xkb) -+/* Get the current symbol name. */ -+const char * xkb_get_current_symbol_name(XkbPlugin * xkb) - { - return xkb_get_symbol_name_by_res_no(xkb, xkb->current_group_xkb_no); - } - --/* Get the current group name converted to lowercase. */ --const char * xkb_get_current_group_name_lowercase(XkbPlugin * xkb) -+/* Get the current symbol name converted to lowercase. */ -+const char * xkb_get_current_symbol_name_lowercase(XkbPlugin * xkb) - { -- const char * tmp = xkb_get_current_group_name(xkb); -- return g_utf8_strdown(tmp, -1); -+ const char * tmp = xkb_get_current_symbol_name(xkb); -+ return ((tmp != NULL) ? g_utf8_strdown(tmp, -1) : NULL); - } - - /* Refresh current group number from Xkb state. */ - static void refresh_group_xkb(XkbPlugin * xkb) - { - XkbStateRec xkb_state; -- XkbGetState(xkb->dsp, xkb->device_id, &xkb_state); -+ XkbGetState(GDK_DISPLAY(), XkbUseCoreKbd, &xkb_state); - xkb->current_group_xkb_no = xkb_state.group; - } - --/* Initialize the Xkb structures. */ --static int do_init_xkb(XkbPlugin * xkb) -+/* Initialize the keyboard description initially or after a NewKeyboard event. */ -+static int initialize_keyboard_description(XkbPlugin * xkb) - { -- /* Create hash table. */ -- xkb->group_hash_table = g_hash_table_new(g_direct_hash, NULL); -- -- /* Initialize the Xkb extension. */ -- int major, minor, opcode; -- Bool status = XkbQueryExtension(xkb->dsp, &opcode, -- &xkb->base_event_code, &xkb->base_error_code, &major, &minor); -- -- /* Use the core keyboard. */ -- xkb->device_id = XkbUseCoreKbd; -+ /* Free the strings. */ -+ int i; -+ for (i = 0; i < XkbNumKbdGroups; i += 1) -+ { -+ g_free(xkb->group_names[i]); -+ g_free(xkb->symbol_names[i]); -+ xkb->group_names[i] = NULL; -+ xkb->symbol_names[i] = NULL; -+ } - - /* Allocate a keyboard description structure. */ -+ int status = False; - XkbDescRec * kbd_desc_ptr = XkbAllocKeyboard(); - if (kbd_desc_ptr == NULL) - { - ERR("Failed to get keyboard description\n"); - goto HastaLaVista; - } -- kbd_desc_ptr->dpy = xkb->dsp; - - /* Fetch information into the keyboard description. */ -- XkbGetControls(xkb->dsp, XkbAllControlsMask, kbd_desc_ptr); -- XkbGetNames(xkb->dsp, XkbSymbolsNameMask, kbd_desc_ptr); -- XkbGetNames(xkb->dsp, XkbGroupNamesMask, kbd_desc_ptr); -+ XkbGetControls(GDK_DISPLAY(), XkbAllControlsMask, kbd_desc_ptr); -+ XkbGetNames(GDK_DISPLAY(), XkbSymbolsNameMask, kbd_desc_ptr); -+ XkbGetNames(GDK_DISPLAY(), XkbGroupNamesMask, kbd_desc_ptr); - - if (kbd_desc_ptr->names == NULL) - { -@@ -137,12 +151,11 @@ static int do_init_xkb(XkbPlugin * xkb) - - /* Determine the group names. Trim off text beginning at a '('. */ - const Atom * tmp_group_source = kbd_desc_ptr->names->groups; -- int i; - for (i = 0; i < xkb->group_count; i++) - { - if (tmp_group_source[i] != None) - { -- char * ptr = XGetAtomName(xkb->dsp, tmp_group_source[i]); -+ char * ptr = XGetAtomName(GDK_DISPLAY(), tmp_group_source[i]); - xkb->group_names[i] = ptr; - if ((ptr != NULL) && ((ptr = strchr(ptr, '('))) != NULL) - *ptr = '\0'; -@@ -153,7 +166,7 @@ static int do_init_xkb(XkbPlugin * xkb) - Atom sym_name_atom = kbd_desc_ptr->names->symbols; - char * sym_name; - if ((sym_name_atom == None) -- || ((sym_name = XGetAtomName(xkb->dsp, sym_name_atom)) == NULL)) -+ || ((sym_name = XGetAtomName(GDK_DISPLAY(), sym_name_atom)) == NULL)) - goto HastaLaVista; - - /* Parse and store symbol names. */ -@@ -190,83 +203,106 @@ static int do_init_xkb(XkbPlugin * xkb) - { - xkb->group_count = 2; - xkb->symbol_names[1] = xkb->symbol_names[0]; -- xkb->symbol_names[0] = strdup("us"); -- xkb->group_names[0] = strdup("US/ASCII"); -- xkb->group_names[1] = strdup("Japanese"); -+ xkb->symbol_names[0] = g_strdup("us"); -+ xkb->group_names[0] = g_strdup("US/ASCII"); -+ xkb->group_names[1] = g_strdup("Japanese"); - } - else if (count < xkb->group_count) - { - /* Ensure that the names are fully initialized. */ - int j = count, k = xkb->group_count; - while(--j >= 0) xkb->symbol_names[--k] = xkb->symbol_names[j]; -- while(--k >= 0) xkb->symbol_names[k] = strdup("en_US"); -+ while(--k >= 0) xkb->symbol_names[k] = g_strdup("en_US"); - } - -- /* Enxure that the names are fully initialized. */ -+ /* Ensure that the names are fully initialized. */ - for (i = 0; i < xkb->group_count; i++) - { - if (xkb->symbol_names[i] == NULL) - { - ERR("\nGroup Symbol %i is undefined, set to 'U/A' !\n", i+1); -- xkb->symbol_names[i] = strdup("U/A"); -+ xkb->symbol_names[i] = g_strdup("U/A"); - } - } - -+ /* Create or recreate hash table. -+ * The layout that was associated to the windows may or may not be at the same group number, -+ * and worse, may no longer exist, which there is no meaningful way to deal with. */ -+ if (xkb->group_hash_table != NULL) -+ g_hash_table_destroy(xkb->group_hash_table); -+ xkb->group_hash_table = g_hash_table_new(g_direct_hash, NULL); -+ - status = True; - - HastaLaVista: - if (kbd_desc_ptr != NULL) - XkbFreeKeyboard(kbd_desc_ptr, 0, True); -+ - return status; - } - -+/* GDK event filter that receives events from all windows and the Xkb extension. */ -+static GdkFilterReturn xkb_event_filter(GdkXEvent * xevent, GdkEvent * event, XkbPlugin * xkb) -+{ -+ XEvent * ev = (XEvent *) xevent; -+ -+ if (ev->xany.type == xkb->base_event_code + XkbEventCode) -+ { -+ /* Xkb event. */ -+ XkbEvent * xkbev = (XkbEvent *) ev; -+ if (xkbev->any.xkb_type == XkbNewKeyboardNotify) -+ { -+ initialize_keyboard_description(xkb); -+ refresh_group_xkb(xkb); -+ xkb_redraw(xkb); -+ xkb_enter_locale_by_process(xkb); -+ } -+ else if (xkbev->any.xkb_type == XkbStateNotify) -+ { -+ if (xkbev->state.group != xkb->current_group_xkb_no) -+ { -+ /* Switch to the new group and redraw the display. */ -+ xkb->current_group_xkb_no = xkbev->state.group; -+ refresh_group_xkb(xkb); -+ xkb_redraw(xkb); -+ xkb_enter_locale_by_process(xkb); -+ } -+ } -+ } -+ return GDK_FILTER_CONTINUE; -+} -+ - /* Initialize the Xkb interface. */ - void xkb_mechanism_constructor(XkbPlugin * xkb) - { -- /* Enable the Xkb extension on all clients. */ -- XkbIgnoreExtension(False); -- -- /* Open the display. */ -- int major = XkbMajorVersion; -- int minor = XkbMinorVersion; -- char * display_name = ""; -- int event_code; -- int error_rtrn; -- int reason_rtrn; -- xkb->dsp = XkbOpenDisplay(display_name, &event_code, &error_rtrn, &major, &minor, &reason_rtrn); -- -- switch (reason_rtrn) -+ /* Initialize Xkb extension. */ -+ int opcode; -+ int maj = XkbMajorVersion; -+ int min = XkbMinorVersion; -+ if ((XkbLibraryVersion(&maj, &min)) -+ && (XkbQueryExtension(GDK_DISPLAY(), &opcode, &xkb->base_event_code, &xkb->base_error_code, &maj, &min))) - { -- case XkbOD_BadLibraryVersion: -- ERR("Bad XKB library version.\n"); -- return; -- case XkbOD_ConnectionRefused: -- ERR("Connection to X server refused.\n"); -- return; -- case XkbOD_BadServerVersion: -- ERR("Bad X server version.\n"); -- return; -- case XkbOD_NonXkbServer: -- ERR("XKB not present.\n"); -- return; -- case XkbOD_Success: -- break; -- } -+ /* Read the keyboard description. */ -+ initialize_keyboard_description(xkb); - -- /* Initialize our mechanism. */ -- if (do_init_xkb(xkb) != True) -- return; -+ /* Establish GDK event filter. */ -+ gdk_window_add_filter(NULL, (GdkFilterFunc) xkb_event_filter, (gpointer) xkb); - -- /* Specify events we will receive. */ -- XkbSelectEventDetails(xkb->dsp, xkb->device_id, XkbStateNotify, XkbAllStateComponentsMask, XkbGroupStateMask); -+ /* Specify events we will receive. */ -+ XkbSelectEvents(GDK_DISPLAY(), XkbUseCoreKbd, XkbNewKeyboardNotifyMask, XkbNewKeyboardNotifyMask); -+ XkbSelectEventDetails(GDK_DISPLAY(), XkbUseCoreKbd, XkbStateNotify, XkbAllStateComponentsMask, XkbGroupStateMask); - -- /* Get current state. */ -- refresh_group_xkb(xkb); -+ /* Get current state. */ -+ refresh_group_xkb(xkb); -+ } - } - - /* Deallocate resources associated with Xkb interface. */ - void xkb_mechanism_destructor(XkbPlugin * xkb) - { -+ /* Remove event filter. */ -+ gdk_window_remove_filter(NULL, (GdkFilterFunc) xkb_event_filter, xkb); -+ - /* Free group and symbol name memory. */ - int i; - for (i = 0; i < xkb->group_count; i++) -@@ -283,21 +319,11 @@ void xkb_mechanism_destructor(XkbPlugin * xkb) - } - } - -- /* Close the display. */ -- XCloseDisplay(xkb->dsp); -- xkb->dsp = NULL; -- - /* Destroy the hash table. */ - g_hash_table_destroy(xkb->group_hash_table); - xkb->group_hash_table = NULL; - } - --/* Return the connection number for the display. */ --int xkb_get_connection_number(XkbPlugin * xkb) --{ -- return ConnectionNumber(xkb->dsp); --} -- - /* Set the layout to the next layout. */ - int xkb_change_group(XkbPlugin * xkb, int increment) - { -@@ -307,33 +333,13 @@ int xkb_change_group(XkbPlugin * xkb, int increment) - if (next_group >= xkb->group_count) next_group = 0; - - /* Execute the change. */ -- XkbLockGroup(xkb->dsp, xkb->device_id, next_group); -+ XkbLockGroup(GDK_DISPLAY(), XkbUseCoreKbd, next_group); - refresh_group_xkb(xkb); - xkb_redraw(xkb); - xkb_enter_locale_by_process(xkb); - return 1; - } - --/* Callback when activity detected on the Xkb channel. */ --gboolean xkb_gio_callback(GIOChannel * source, GIOCondition condition, gpointer data) --{ -- XkbPlugin * xkb = (XkbPlugin *) data; -- -- XkbEvent evnt; -- XNextEvent(xkb->dsp, &evnt.core); -- if ((evnt.type == xkb->base_event_code) -- && (evnt.any.xkb_type == XkbStateNotify) -- && (evnt.state.group != xkb->current_group_xkb_no)) -- { -- /* Switch to the new group and redraw the display. */ -- xkb->current_group_xkb_no = evnt.state.group; -- refresh_group_xkb(xkb); -- xkb_redraw(xkb); -- xkb_enter_locale_by_process(xkb); -- } -- return TRUE; --} -- - /* React to change of focus by switching to the application's layout or the default layout. */ - void xkb_active_window_changed(XkbPlugin * xkb, gint pid) - { -@@ -345,7 +351,7 @@ void xkb_active_window_changed(XkbPlugin * xkb, gint pid) - - if (new_group_xkb_no < xkb->group_count) - { -- XkbLockGroup(xkb->dsp, xkb->device_id, new_group_xkb_no); -+ XkbLockGroup(GDK_DISPLAY(), XkbUseCoreKbd, new_group_xkb_no); - refresh_group_xkb(xkb); - } - } -diff --git a/src/plugins/xkb/xkb.h b/src/plugins/xkb/xkb.h -index 9265198..20c7ed3 100644 ---- a/src/plugins/xkb/xkb.h -+++ b/src/plugins/xkb/xkb.h -@@ -49,10 +49,8 @@ typedef struct { - GtkWidget * per_app_default_layout_menu; /* Combo box of all available layouts */ - - /* Mechanism. */ -- Display * dsp; /* Handle to X display */ - int base_event_code; /* Result of initializing Xkb extension */ - int base_error_code; -- int device_id; /* Keyboard device ID (always "core keyboard") */ - int current_group_xkb_no; /* Current layout */ - int group_count; /* Count of groups as returned by Xkb */ - char * group_names[XkbNumKbdGroups]; /* Group names as returned by Xkb */ -@@ -67,12 +65,11 @@ extern int xkb_get_current_group_xkb_no(XkbPlugin * xkb); - extern int xkb_get_group_count(XkbPlugin * xkb); - extern const char * xkb_get_symbol_name_by_res_no(XkbPlugin * xkb, int group_res_no); - extern const char * xkb_get_current_group_name(XkbPlugin * xkb); --extern const char * xkb_get_current_group_name_lowercase(XkbPlugin * xkb); -+extern const char * xkb_get_current_symbol_name(XkbPlugin * xkb); -+extern const char * xkb_get_current_symbol_name_lowercase(XkbPlugin * xkb); - extern void xkb_mechanism_constructor(XkbPlugin * xkb); - extern void xkb_mechanism_destructor(XkbPlugin * xkb); --extern int xkb_get_connection_number(XkbPlugin * xkb); - extern int xkb_change_group(XkbPlugin * xkb, int increment); --extern gboolean xkb_gio_callback(GIOChannel * source, GIOCondition condition, gpointer data); - extern void xkb_active_window_changed(XkbPlugin * xkb, GPid pid); - - #endif --- -1.7.0 - diff --git a/extra/lxpanel/PKGBUILD b/extra/lxpanel/PKGBUILD deleted file mode 100644 index 9ad1d1774..000000000 --- a/extra/lxpanel/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -$Id: PKGBUILD 94639 2010-10-08 22:08:39Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> -pkgname=lxpanel -pkgver=0.5.6 -pkgrel=1 -pkgdesc="Panel of the LXDE Desktop" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://lxde.org/" -groups=('lxde') -depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data') -source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz - Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch) -optdepends=(pcmanfm) -md5sums=('3c6b5498b5f4109c3913b10a66809fe6' - 'afe03191cbeccfc702f9a04bffd62dbf') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i $srcdir/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch - ./configure --sysconfdir=/etc --prefix=/usr - make - make DESTDIR="$pkgdir" install -} diff --git a/extra/lxsession-lite/PKGBUILD b/extra/lxsession-lite/PKGBUILD deleted file mode 100644 index cc60a844b..000000000 --- a/extra/lxsession-lite/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> -pkgname=lxsession-lite -pkgver=0.4.5 -pkgrel=1 -pkgdesc="Session manager of the LXDE Desktop (light version)" -arch=('i686' 'x86_64') -license=('GPL2') -url="http://lxde.org/" -groups=('lxde') -depends=('gtk2' 'dbus') -makedepends=('pkgconfig' 'intltool') -replaces=("lxde-settings-daemon") -conflicts=('lxsession' 'lxde-settings-daemon') -source=(http://downloads.sourceforge.net/sourceforge/lxde/lxsession-${pkgver}.tar.gz) -md5sums=('d5cd0cb733748191b2c7371c9efda155') - -build() { - cd "$srcdir/lxsession-$pkgver" - ./configure --sysconfdir=/etc --prefix=/usr - make - make DESTDIR="$pkgdir" install -} diff --git a/extra/menu-cache/PKGBUILD b/extra/menu-cache/PKGBUILD deleted file mode 100644 index 29e0a408d..000000000 --- a/extra/menu-cache/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> - -pkgname=menu-cache -pkgver=0.3.2 -pkgrel=1 -pkgdesc="Caches to speed up freedesktop.org's application menus use." -arch=('i686' 'x86_64') -license=('GPL2') -url="http://lxde.org/" -groups=('lxde') -depends=('intltool' 'glib2') -options=('!libtool') -makedepends=('pkgconfig') -source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz) -md5sums=('ac4a9ea77db68d3db3f9f53cc75af66a') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/menu-cache --disable-static || return 1 - make || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install || return 1 -} diff --git a/extra/nx-common/nx-gcc44.patch b/extra/nx-common/nx-gcc44.patch deleted file mode 100644 index 5b7b7e1f6..000000000 --- a/extra/nx-common/nx-gcc44.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- nx-3.3.0/nxcomp/Loop.cpp.orig 2009-05-17 12:22:19.000000000 +0200 -+++ nx-3.3.0/nxcomp/Loop.cpp 2009-05-17 12:22:43.000000000 +0200 -@@ -10979,7 +10979,7 @@ - packMethod == PACK_LOSSLESS || - packMethod == PACK_ADAPTIVE) - { -- char *dash = rindex(opt, '-'); -+ const char *dash = rindex(opt, '-'); - - if (dash != NULL && strlen(dash) == 2 && - *(dash + 1) >= '0' && *(dash + 1) <= '9') - diff --git a/extra/nxserver/nx-gcc44.patch b/extra/nxserver/nx-gcc44.patch deleted file mode 100644 index 5b7b7e1f6..000000000 --- a/extra/nxserver/nx-gcc44.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- nx-3.3.0/nxcomp/Loop.cpp.orig 2009-05-17 12:22:19.000000000 +0200 -+++ nx-3.3.0/nxcomp/Loop.cpp 2009-05-17 12:22:43.000000000 +0200 -@@ -10979,7 +10979,7 @@ - packMethod == PACK_LOSSLESS || - packMethod == PACK_ADAPTIVE) - { -- char *dash = rindex(opt, '-'); -+ const char *dash = rindex(opt, '-'); - - if (dash != NULL && strlen(dash) == 2 && - *(dash + 1) >= '0' && *(dash + 1) <= '9') - diff --git a/extra/nxserver/nxcompshad-gcc43.patch b/extra/nxserver/nxcompshad-gcc43.patch deleted file mode 100644 index 274c36635..000000000 --- a/extra/nxserver/nxcompshad-gcc43.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- nxcompshad/Misc.h~ 2007-06-04 13:39:49.000000000 +0200 -+++ nxcompshad/Misc.h 2008-04-12 12:46:24.000000000 +0200 -@@ -18,10 +18,12 @@ - #ifndef Misc_H - #define Misc_H - --#include <iostream> -+#include <iostream> - --#include <errno.h> --#include <string.h> -+#include <cerrno> -+#include <cstring> -+ -+using namespace std; - - // - // Error handling macros. - diff --git a/extra/obconf/PKGBUILD b/extra/obconf/PKGBUILD deleted file mode 100644 index 0fa8c420e..000000000 --- a/extra/obconf/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 123764 2011-05-12 21:09:06Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Tobias Kieslich <tobias@archlinux.org> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=obconf -pkgver=2.0.3 -pkgrel=4 -pkgdesc="A GTK2 based configuration tool for the Openbox windowmanager" -arch=('i686' 'x86_64') -url="http://icculus.org/openbox/index.php/ObConf:About" -license=('GPL') -depends=('openbox' 'gtk2' 'libglade' 'desktop-file-utils' 'libsm') -install=${pkgname}.install -source=("http://icculus.org/openbox/${pkgname}/${pkgname}-${pkgver}.tar.gz" - 'http://icculus.org/openbox/mw/images/8/80/Obconf-72.png') -md5sums=('b22e273721851dedad72acbc77eefb68' - '340ae4732e76731d2838473541eb8d4e') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - - ./configure --prefix=/usr - make - sed -i 's/=openbox/=obconf/' obconf.desktop -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - - make DESTDIR="${pkgdir}" install - install -Dm644 ../Obconf-72.png \ - "${pkgdir}"/usr/share/pixmaps/obconf.png -} diff --git a/extra/obconf/obconf.install b/extra/obconf/obconf.install deleted file mode 100644 index 5264d8979..000000000 --- a/extra/obconf/obconf.install +++ /dev/null @@ -1,15 +0,0 @@ -# arg 1: the new package version -post_install() { - update-desktop-database -q /usr/share/applications - update-mime-database /usr/share/mime 1> /dev/null -} - -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -post_remove() { - update-desktop-database -q - update-mime-database /usr/share/mime 1> /dev/null -} diff --git a/extra/openbox/PKGBUILD b/extra/openbox/PKGBUILD deleted file mode 100644 index a71e0b16a..000000000 --- a/extra/openbox/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 89725 2010-09-03 12:51:52Z remy $ -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> - -pkgname=openbox -pkgver=3.4.11.2 -pkgrel=2 -pkgdesc="A window manager for the X11 windowing system" -arch=('i686' 'x86_64') -url="http://openbox.org" -license=('GPL') -depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr' - 'libxcursor' 'pango') -optdepends=('pyxdg: for the xdg-autostart script') -groups=('lxde') -install=${pkgname}.install -options=('!libtool' 'force') -backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml') -source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz - 'which-2.20.patch') -md5sums=('30e669134fa81df810fe7d1dc59cd931' - 'ec5e3d4d74779b0ca576a053ae54124d') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # FS#11455 - patch -Np1 -i ${srcdir}/which-2.20.patch || return 1 - sed -i 's#python#python2#' tools/xdg-autostart/xdg-autostart - ./configure --prefix=/usr \ - --with-x \ - --enable-startup-notification \ - --sysconfdir=/etc - make || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install - - sed -i "s:startkde:/usr/bin/\0:" \ - ${pkgdir}/usr/share/xsessions/openbox-kde.desktop - sed -i "s:=gnome-session:=/usr/bin/gnome-session:" \ - ${pkgdir}/usr/share/xsessions/openbox-gnome.desktop -} diff --git a/extra/openbox/openbox.install b/extra/openbox/openbox.install deleted file mode 100644 index 301c22127..000000000 --- a/extra/openbox/openbox.install +++ /dev/null @@ -1,9 +0,0 @@ -post_install() { - echo "Place menu.xml, rc.xml and autostart.sh in ~/.config/openbox" - echo "They can be found in /etc/xdg/openbox" -} - -post_upgrade() { - post_install -} - diff --git a/extra/openbox/which-2.20.patch b/extra/openbox/which-2.20.patch deleted file mode 100644 index 7f663ae49..000000000 --- a/extra/openbox/which-2.20.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- openbox-3.4.11.1/data/autostart.sh.in 2010-03-14 09:40:37.000000000 -0500 -+++ openbox-3.4.11.1/data/autostart.sh.in 2010-03-26 14:44:36.000000000 -0500 -@@ -3,13 +3,13 @@ - - # Set a background color - BG="" --if which hsetroot >/dev/null; then -+if which hsetroot >/dev/null 2>&1; then - BG=hsetroot - else -- if which esetroot >/dev/null; then -+ if which esetroot >/dev/null 2>&1; then - BG=esetroot - else -- if which xsetroot >/dev/null; then -+ if which xsetroot >/dev/null 2>&1; then - BG=xsetroot - fi - fi -@@ -17,28 +17,28 @@ - test -z $BG || $BG -solid "#303030" - - # D-bus --if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then -+if which dbus-launch >/dev/null 2>&1 && test -z "$DBUS_SESSION_BUS_ADDRESS"; then - eval `dbus-launch --sh-syntax --exit-with-session` - fi - - # Make GTK apps look and behave how they were set up in the gnome config tools - if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then - @libexecdir@/gnome-settings-daemon & --elif which gnome-settings-daemon >/dev/null; then -+elif which gnome-settings-daemon >/dev/null 2>&1; then - gnome-settings-daemon & - # Make GTK apps look and behave how they were set up in the XFCE config tools --elif which xfce-mcs-manager >/dev/null; then -+elif which xfce-mcs-manager >/dev/null 2>&1; then - xfce-mcs-manager n & - fi - - # Preload stuff for KDE apps --if which start_kdeinit >/dev/null; then -+if which start_kdeinit >/dev/null 2>&1; then - LD_BIND_NOW=true start_kdeinit --new-startup +kcminit_startup & - fi - - # Run XDG autostart things. By default don't run anything desktop-specific - # See xdg-autostart --help more info - DESKTOP_ENV="OPENBOX" --if which @secretbindir@/xdg-autostart >/dev/null; then -+if which @secretbindir@/xdg-autostart >/dev/null 2>&1; then - @secretbindir@/xdg-autostart $DESKTOP_ENV - fi diff --git a/extra/pcmanfm/PKGBUILD b/extra/pcmanfm/PKGBUILD deleted file mode 100644 index f08c841c7..000000000 --- a/extra/pcmanfm/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 110558 2011-02-19 22:38:04Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> -pkgname=pcmanfm -pkgver=0.9.8 -pkgrel=5 -pkgdesc="File manager of the LXDE Desktop" -arch=('i686' 'x86_64') -url="http://pcmanfm.sourceforge.net/" -license=('GPL') -groups=('lxde') -depends=('gtk2' 'desktop-file-utils' 'libfm') -makedepends=('intltool' 'pkgconfig') -source=(http://downloads.sourceforge.net/pcmanfm/pcmanfm-$pkgver.tar.gz - revert-new-IPC.patch) -md5sums=('4a7fdc0526ed14e3293d784c0ce27dea' '4bedb071a83ba5a7af1aa43b71a262a9') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i $srcdir/revert-new-IPC.patch - ./configure --sysconfdir=/etc --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/extra/pcmanfm/pcmanfm.install b/extra/pcmanfm/pcmanfm.install deleted file mode 100644 index 98965c989..000000000 --- a/extra/pcmanfm/pcmanfm.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - update-mime-database usr/share/mime > /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - - diff --git a/extra/pcmanfm/revert-new-IPC.patch b/extra/pcmanfm/revert-new-IPC.patch deleted file mode 100644 index fa64fde42..000000000 --- a/extra/pcmanfm/revert-new-IPC.patch +++ /dev/null @@ -1,432 +0,0 @@ -diff -Naur pcmanfm-20101030_10ae31a.orig/src/Makefile.am pcmanfm-20101030_10ae31a/src/Makefile.am ---- pcmanfm-20101030_10ae31a.orig/src/Makefile.am 2010-10-30 20:36:02.000000000 +0200 -+++ pcmanfm-20101030_10ae31a/src/Makefile.am 2010-10-31 09:13:48.000000000 +0100 -@@ -16,7 +16,6 @@ - pref.c pref.h \ - utils.c utils.h \ - gseal-gtk-compat.h \ -- single-inst.c single-inst.h \ - $(NULL) - - EXTRA_DIST= \ -diff -Naur pcmanfm-20101030_10ae31a.orig/src/pcmanfm.c pcmanfm-20101030_10ae31a/src/pcmanfm.c ---- pcmanfm-20101030_10ae31a.orig/src/pcmanfm.c 2010-10-30 20:36:02.000000000 +0200 -+++ pcmanfm-20101030_10ae31a/src/pcmanfm.c 2010-10-31 09:25:45.000000000 +0100 -@@ -31,6 +31,8 @@ - #include <string.h> - /* socket is used to keep single instance */ - #include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/un.h> - #include <signal.h> - #include <unistd.h> /* for getcwd */ - -@@ -41,13 +43,14 @@ - #include "volume-manager.h" - #include "pref.h" - #include "pcmanfm.h" --#include "single-inst.h" -+ -+static int sock; -+GIOChannel* io_channel = NULL; - - static int signal_pipe[2] = {-1, -1}; - gboolean daemon_mode = FALSE; - - static char** files_to_open = NULL; --static int n_files_to_open = 0; - static char* profile = NULL; - static gboolean no_desktop = FALSE; - static gboolean show_desktop = FALSE; -@@ -80,25 +83,13 @@ - { NULL } - }; - --/* single instance command id */ --enum { -- CMD_INVALID, -- CMD_CWD, -- CMD_PROFILE, -- CMD_DESKTOP, -- CMD_DESKTOP_OFF, -- CMD_DAEMON_MODE, -- CMD_DESKTOP_PREF, -- CMD_SET_WALLPAPER, -- CMD_WALLPAPER_MODE, -- CMD_SHOW_PREF, -- CMD_FILES_TO_OPEN, -- CMD_EOF --}; -- - static const char* valid_wallpaper_modes[] = {"color", "stretch", "fit", "center", "tile"}; - -+static gboolean single_instance_check(); -+static void single_instance_finalize(); -+static void get_socket_name(char* buf, int len); - static gboolean pcmanfm_run(); -+static gboolean on_socket_event(GIOChannel* ioc, GIOCondition cond, gpointer data); - - /* it's not safe to call gtk+ functions in unix signal handler - * since the process is interrupted here and the state of gtk+ is unpredictable. */ -@@ -121,97 +112,6 @@ - return TRUE; - } - --static gboolean on_single_inst_command(int cmd, SingleInstCmdData* data) --{ -- switch(cmd) -- { -- case CMD_CWD: -- g_free(ipc_cwd); -- ipc_cwd = single_inst_get_str(data, NULL); -- break; -- case CMD_PROFILE: -- /* Not supported */ -- break; -- case CMD_DESKTOP: -- single_inst_get_bool(data, &show_desktop); -- break; -- case CMD_DESKTOP_OFF: -- single_inst_get_bool(data, &desktop_off); -- break; -- case CMD_DAEMON_MODE: -- /* Not supported */ -- break; -- case CMD_DESKTOP_PREF: -- single_inst_get_bool(data, &desktop_pref); -- break; -- case CMD_SET_WALLPAPER: -- g_free(set_wallpaper); -- set_wallpaper = single_inst_get_str(data, NULL); -- break; -- case CMD_WALLPAPER_MODE: -- g_free(wallpaper_mode); -- wallpaper_mode = single_inst_get_str(data, NULL); -- break; -- case CMD_SHOW_PREF: -- single_inst_get_int(data, &show_pref); -- break; -- case CMD_FILES_TO_OPEN: -- { -- g_strfreev(files_to_open); -- n_files_to_open = 0; -- files_to_open = single_inst_get_strv(data, &n_files_to_open); -- } -- break; -- case CMD_EOF: -- { -- int i; -- /* canonicalize filename if needed. */ -- for(i = 0; i < n_files_to_open; ++i) -- { -- char* file = files_to_open[i]; -- char* scheme = g_uri_parse_scheme(file); -- if(scheme) /* a valid URI */ -- { -- /* FIXME: should we canonicalize URIs? and how about file:///? */ -- g_free(scheme); -- } -- else /* a file path */ -- { -- files_to_open[i] = fm_canonicalize_filename(file, ipc_cwd); -- g_free(file); -- } -- } -- -- /* handle the parsed result and run the main program */ -- pcmanfm_run(); -- } -- break; -- } -- return TRUE; --} -- --/* we're not the first instance. pass the argv to the existing one. */ --static void pass_args_to_existing_instance() --{ -- /* send our current working dir to existing instance via IPC. */ -- ipc_cwd = g_get_current_dir(); -- single_inst_send_str(CMD_CWD, ipc_cwd); -- g_free(ipc_cwd); -- -- single_inst_send_bool(CMD_DESKTOP, show_desktop); -- single_inst_send_bool(CMD_DESKTOP_OFF, desktop_off); -- single_inst_send_bool(CMD_DESKTOP_PREF, desktop_pref); -- single_inst_send_str(CMD_SET_WALLPAPER, set_wallpaper); -- single_inst_send_str(CMD_WALLPAPER_MODE, wallpaper_mode); -- single_inst_send_int(CMD_SHOW_PREF, show_pref); -- /* single_inst_send_bool(CMD_FIND_FILES, find_files); */ -- -- single_inst_send_strv(CMD_FILES_TO_OPEN, files_to_open); -- single_inst_send_bool(CMD_EOF, TRUE); /* all args have been sent. */ -- -- single_inst_finalize(); --} -- - int main(int argc, char** argv) - { - FmConfig* config; -@@ -230,17 +130,10 @@ - return 1; - } - -- /* ensure that there is only one instance of pcmanfm. */ -- switch(single_inst_init("pcmanfm", on_single_inst_command)) -- { -- case SINGLE_INST_CLIENT: /* we're not the first instance. */ -- pass_args_to_existing_instance(); -- gdk_notify_startup_complete(); -- return 0; -- case SINGLE_INST_ERROR: /* error happened. */ -- single_inst_finalize(); -- return 1; -- } -+ /* ensure that there is only one instance of pcmanfm. -+ if there is an existing instance, command line arguments -+ will be passed to the existing instance, and exit() will be called here. */ -+ single_instance_check(); - - if(pipe(signal_pipe) == 0) - { -@@ -274,13 +167,240 @@ - fm_volume_manager_finalize(); - } - -- single_inst_finalize(); -+ single_instance_finalize(); -+ - fm_gtk_finalize(); - - g_object_unref(config); - return 0; - } - -+inline static void buf_append_str(GByteArray* buf, const char* str) -+{ -+ int len; -+ if(G_LIKELY(str)) -+ { -+ len = strlen(str) + 1; -+ g_byte_array_append(buf, (guint8*)&len, sizeof(len)); -+ g_byte_array_append(buf, (guint8*)str, len); -+ } -+ else -+ { -+ len = 0; -+ g_byte_array_append(buf, (guint8*)&len, sizeof(len)); -+ } -+} -+ -+inline static GByteArray* args_to_ipc_buf() -+{ -+ int i, len; -+ GByteArray* buf = g_byte_array_sized_new(4096); -+ /* send our current working dir to existing instance via IPC. */ -+ ipc_cwd = g_get_current_dir(); -+ buf_append_str(buf, ipc_cwd); -+ g_free(ipc_cwd); -+ -+ /* g_byte_array_append(buf, (guint8*)&new_tab, sizeof(new_tab)); */ -+ g_byte_array_append(buf, (guint8*)&show_desktop, sizeof(show_desktop)); -+ g_byte_array_append(buf, (guint8*)&desktop_off, sizeof(desktop_off)); -+ g_byte_array_append(buf, (guint8*)&desktop_pref, sizeof(desktop_pref)); -+ buf_append_str(buf, set_wallpaper); -+ buf_append_str(buf, wallpaper_mode); -+ g_byte_array_append(buf, (guint8*)&show_pref, sizeof(show_pref)); -+ g_byte_array_append(buf, (guint8*)&find_files, sizeof(find_files)); -+ g_byte_array_append(buf, (guint8*)&no_desktop, sizeof(no_desktop)); -+ -+ len = files_to_open ? g_strv_length(files_to_open) : 0; -+ g_byte_array_append(buf, (guint8*)&len, sizeof(len)); -+ for(i = 0; i < len; ++i) -+ buf_append_str(buf, files_to_open[i]); -+ -+ return buf; -+} -+ -+inline static gboolean buf_read_bool(const char**p) -+{ -+ gboolean ret; -+ memcpy(&ret, *p, sizeof(ret)); -+ *p += sizeof(ret); -+ return ret; -+} -+ -+inline static int buf_read_int(const char**p) -+{ -+ int ret; -+ memcpy(&ret, *p, sizeof(ret)); -+ *p += sizeof(ret); -+ return ret; -+} -+ -+inline static char* buf_read_str(const char**p) -+{ -+ char* ret; -+ int len = buf_read_int(p); -+ if(len > 0) -+ { -+ ret = g_malloc(len); -+ memcpy(ret, *p, len); -+ *p += len; -+ } -+ else -+ ret = NULL; -+ return ret; -+} -+ -+inline static void ipc_buf_to_args(GByteArray* buf) -+{ -+ int i, len; -+ char* p = buf->data; -+ char* cwd = buf_read_str(&p); -+ /* new_tab = buf_read_bool(&p); */ -+ show_desktop = buf_read_bool(&p); -+ desktop_off = buf_read_bool(&p); -+ desktop_pref = buf_read_bool(&p); -+ g_free(set_wallpaper); -+ set_wallpaper = buf_read_str(&p); -+ g_free(wallpaper_mode); -+ wallpaper_mode = buf_read_str(&p); -+ show_pref = buf_read_int(&p); -+ find_files = buf_read_bool(&p); -+ no_desktop = buf_read_bool(&p); -+ -+ len = buf_read_int(&p); -+ /* g_debug("len = %d", len); */ -+ if(len > 0) -+ { -+ files_to_open = g_new(char*, len + 1); -+ for(i = 0; i < len; ++i) -+ { -+ char* file = buf_read_str(&p); -+ char* scheme = g_uri_parse_scheme(file); -+ if(scheme) /* a valid URI */ -+ { -+ /* FIXME: should we canonicalize URIs? and how about file:///? */ -+ files_to_open[i] = file; -+ g_free(scheme); -+ } -+ else /* a file path */ -+ { -+ files_to_open[i] = fm_canonicalize_filename(file, cwd); -+ g_free(file); -+ } -+ } -+ files_to_open[i] = NULL; -+ } -+ else -+ files_to_open = NULL; -+ g_free(cwd); -+} -+ -+gboolean on_socket_event( GIOChannel* ioc, GIOCondition cond, gpointer data ) -+{ -+ int client, r; -+ socklen_t addr_len = 0; -+ struct sockaddr_un client_addr ={ 0 }; -+ static char buf[ 1024 ]; -+ GByteArray* args; -+ -+ if ( cond & G_IO_IN ) -+ { -+ client = accept( g_io_channel_unix_get_fd( ioc ), (struct sockaddr *)&client_addr, &addr_len ); -+ if ( client != -1 ) -+ { -+ args = g_byte_array_sized_new(4096); -+ while( (r = read( client, buf, sizeof(buf) )) > 0 ) -+ g_byte_array_append( args, (guint8*)buf, r); -+ shutdown( client, 2 ); -+ close( client ); -+ ipc_buf_to_args(args); -+ g_byte_array_free( args, TRUE ); -+ pcmanfm_run(); -+ } -+ } -+ return TRUE; -+} -+ -+void get_socket_name( char* buf, int len ) -+{ -+ char* dpy = gdk_get_display(); -+ g_snprintf( buf, len, "/tmp/.pcmanfm-socket%s-%s", dpy, g_get_user_name() ); -+ g_free( dpy ); -+} -+ -+gboolean single_instance_check() -+{ -+ struct sockaddr_un addr; -+ int addr_len; -+ int ret; -+ int reuse; -+ -+ if((sock = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) -+ { -+ ret = 1; -+ goto _exit; -+ } -+ -+ /* FIXME: use abstract socket */ -+ addr.sun_family = AF_UNIX; -+ get_socket_name(addr.sun_path, sizeof( addr.sun_path )); -+#ifdef SUN_LEN -+ addr_len = SUN_LEN(&addr); -+#else -+ addr_len = strlen( addr.sun_path ) + sizeof( addr.sun_family ); -+#endif -+ -+ /* try to connect to existing instance */ -+ if(connect(sock, (struct sockaddr*)&addr, addr_len) == 0) -+ { -+ /* connected successfully */ -+ GByteArray* buf = args_to_ipc_buf(); -+ write(sock, buf->data, buf->len); -+ g_byte_array_free(buf, TRUE); -+ -+ shutdown( sock, 2 ); -+ close( sock ); -+ ret = 0; -+ goto _exit; -+ } -+ -+ /* There is no existing server, and we are in the first instance. */ -+ unlink( addr.sun_path ); /* delete old socket file if it exists. */ -+ reuse = 1; -+ ret = setsockopt( sock, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse) ); -+ if(bind(sock, (struct sockaddr*)&addr, addr_len) == -1) -+ { -+ ret = 1; -+ goto _exit; -+ } -+ -+ io_channel = g_io_channel_unix_new(sock); -+ g_io_channel_set_encoding(io_channel, NULL, NULL); -+ g_io_channel_set_buffered(io_channel, FALSE); -+ g_io_add_watch(io_channel, G_IO_IN, -+ (GIOFunc)on_socket_event, NULL); -+ if(listen(sock, 5) == -1) -+ { -+ ret = 1; -+ goto _exit; -+ } -+ return TRUE; -+ -+_exit: -+ -+ gdk_notify_startup_complete(); -+ exit( ret ); -+} -+ -+void single_instance_finalize() -+{ -+ char lock_file[256]; -+ shutdown(sock, 2); -+ g_io_channel_unref(io_channel); -+ close(sock); -+ get_socket_name(lock_file, sizeof( lock_file )); -+ unlink(lock_file); -+} -+ - static FmJobErrorAction on_file_info_job_error(FmFileInfoJob* job, GError* err, FmJobErrorSeverity severity, gpointer user_data) - { - if(err->domain == G_IO_ERROR) diff --git a/extra/phonon-xine/PKGBUILD b/extra/phonon-xine/PKGBUILD deleted file mode 100644 index 2d4dccfb1..000000000 --- a/extra/phonon-xine/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id$ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=phonon-xine -pkgver=4.4.4 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://phonon.kde.org" -pkgdesc="Phonon Xine backend" -license=('LGPL') -depends=('xine-lib') -makedepends=('cmake' 'automoc4' 'phonon') -provides=('phonon-backend') -source=("http://download.kde.org/stable/phonon/phonon-backend-xine/${pkgver}/src/phonon-backend-xine-${pkgver}.tar.bz2") -md5sums=('b127104e67538e573adeed3b2fb3bf55') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../phonon-backend-xine-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install -} diff --git a/extra/pidgin/nm09-pidgin.patch b/extra/pidgin/nm09-pidgin.patch deleted file mode 100644 index 1c2471d1f..000000000 --- a/extra/pidgin/nm09-pidgin.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up pidgin-2.7.10/libpurple/network.c.foo pidgin-2.7.10/libpurple/network.c ---- pidgin-2.7.10/libpurple/network.c.foo 2011-03-10 02:21:43.920933267 -0600 -+++ pidgin-2.7.10/libpurple/network.c 2011-03-10 02:23:11.466838793 -0600 -@@ -71,6 +71,10 @@ - #include <dbus/dbus-glib.h> - #include <NetworkManager.h> - -+#if !defined(NM_CHECK_VERSION) -+#define NM_CHECK_VERSION(x,y,z) 0 -+#endif -+ - static DBusGConnection *nm_conn = NULL; - static DBusGProxy *nm_proxy = NULL; - static DBusGProxy *dbus_proxy = NULL; -@@ -863,7 +867,13 @@ nm_update_state(NMState state) - - switch(state) - { -+#if NM_CHECK_VERSION(0,8,992) -+ case NM_STATE_CONNECTED_LOCAL: -+ case NM_STATE_CONNECTED_SITE: -+ case NM_STATE_CONNECTED_GLOBAL: -+#else - case NM_STATE_CONNECTED: -+#endif - /* Call res_init in case DNS servers have changed */ - res_init(); - /* update STUN IP in case we it changed (theoretically we could -@@ -880,6 +890,9 @@ nm_update_state(NMState state) - case NM_STATE_ASLEEP: - case NM_STATE_CONNECTING: - case NM_STATE_DISCONNECTED: -+#if NM_CHECK_VERSION(0,8,992) -+ case NM_STATE_DISCONNECTING: -+#endif - if (prev != NM_STATE_CONNECTED && prev != NM_STATE_UNKNOWN) - break; - if (ui_ops != NULL && ui_ops->network_disconnected != NULL) diff --git a/extra/wvdial/PKGBUILD b/extra/wvdial/PKGBUILD deleted file mode 100644 index 916a2c514..000000000 --- a/extra/wvdial/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 123798 2011-05-13 06:53:04Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> - -pkgname=wvdial -pkgver=1.61 -pkgrel=3 -pkgdesc="A dialer program to connect to the Internet" -url="http://alumnit.ca/wiki/index.php?page=WvDial" -arch=('i686' 'x86_64') -license=('custom') -depends=('wvstreams' 'ppp' 'gcc-libs') -makedepends=('lockdev') -options=('!makeflags' '!buildflags') -source=("http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('acd3b2050c9b65fff2aecda6576ee7bc') - -build() { - cd "${srcdir}"/${pkgname}-${pkgver} - ./configure - make LOCKDEV="-llockdev" -} - -package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make prefix="${pkgdir}"/usr PPPDIR="${pkgdir}"/etc/ppp/peers install - install -Dm644 COPYING.LIB "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/extra/wvstreams/PKGBUILD b/extra/wvstreams/PKGBUILD deleted file mode 100644 index 3abe73609..000000000 --- a/extra/wvstreams/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 75519 2010-04-01 18:49:52Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: dorphell <dorphell@archlinux.org> - -pkgname=wvstreams -pkgver=4.6.1 -pkgrel=2 -pkgdesc="A network programming library written in C++" -arch=('i686' 'x86_64') -url="http://alumnit.ca/wiki/?page=WvStreams" -license=('LGPL') -depends=('zlib' 'pam' 'xplc' "openssl" 'readline') -source=(http://wvstreams.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -md5sums=('2760dac31a43d452a19a3147bfde571c') -options=('!makeflags') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --without-dbus \ - --with-pam \ - --with-openssl \ - --without-tcl \ - --without-qt || return 1 - make COPTS="$CFLAGS -fPIC" CXXOPTS="$CXXFLAGS -fPIC -fpermissive" VERBOSE=1 || return 1 -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 - - # FS#15974 - # --without-dbus still installs the pkg-config file - rm ${pkgdir}/usr/lib/pkgconfig/libwvdbus.pc - # --without-qt still installs the pkg-config file - rm ${pkgdir}/usr/lib/pkgconfig/libwvqt.pc -} diff --git a/extra/xbindkeys/PKGBUILD b/extra/xbindkeys/PKGBUILD deleted file mode 100644 index 9d2e6f0e8..000000000 --- a/extra/xbindkeys/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 114461 2011-03-14 01:44:22Z eric $ -# Contributor: Thayer Williams <thayer@archlinux.org> -# Contributor: damir <damir@archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=xbindkeys -pkgver=1.8.5 -pkgrel=1 -pkgdesc="Launch shell commands with your keyboard or your mouse under X" -arch=('i686' 'x86_64') -url="http://www.nongnu.org/xbindkeys/xbindkeys.html" -license=('GPL') -depends=('libx11' 'guile>=1.8.1' 'tk') -source=(http://www.nongnu.org/xbindkeys/${pkgname}-${pkgver}.tar.gz) -md5sums=('4b66a05594dbc6888c0a6439351aa66d') -sha1sums=('a597cfecce65dd47595510edb8f7eaa094c4b34b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/xplc/PKGBUILD b/extra/xplc/PKGBUILD deleted file mode 100644 index 402abc2ca..000000000 --- a/extra/xplc/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 97257 2010-10-28 04:11:13Z allan $ -# Maintainer: dorphell <dorphell@archlinux.org> -pkgname=xplc -pkgver=0.3.13 -pkgrel=3 -pkgdesc="Cross-Platform Lightweight Components" -arch=(i686 x86_64) -url="http://xplc.sourceforge.net" -license=('LGPL') -depends=('gcc-libs') -source=(http://downloads.sourceforge.net/sourceforge/xplc/$pkgname-$pkgver.tar.gz) -md5sums=('39da3270527c8712b8e8fcf03768d29f') - -build() { - cd $srcdir/$pkgname-$pkgver - - export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" - - ./configure --prefix=/usr --mandir=/usr/share/man --without-libuuid - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - mv $pkgdir/usr/share/man/man1/{uuidgen.1,uuidcdef.1} - rm -f $pkgdir/usr/bin/uuidgen -} diff --git a/extra/zope-interface/PKGBUILD b/extra/zope-interface/PKGBUILD deleted file mode 100644 index e584a84c1..000000000 --- a/extra/zope-interface/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 113445 2011-03-08 17:33:50Z ibiru $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> - -pkgname=zope-interface -pkgver=3.6.1 -pkgrel=1 -pkgdesc="Separate distribution of the zope.interface package used in Zope 3." -license=('ZPL') -arch=('i686' 'x86_64') -url="http://pypi.python.org/pypi/zope.interface" -depends=('python2') -source=(http://pypi.python.org/packages/source/z/zope.interface/zope.interface-${pkgver}.tar.gz) -md5sums=('7a895181b8d10be4a7e9a3afa13cd3be') - -build() { - cd ${srcdir}/zope.interface-${pkgver} - python2 setup.py install --prefix=/usr --root=${pkgdir} --optimize=1 - # Blabla. - rm $pkgdir/usr/lib/python2.7/site-packages/zope/interface/README*.txt -} |