From 8634a064b17334eb58699897220aeed2fc9a54db Mon Sep 17 00:00:00 2001 From: root Date: Thu, 9 Jun 2011 22:46:45 +0000 Subject: Thu Jun 9 22:46:45 UTC 2011 --- libre/initscripts/PKGBUILD | 9 ++++++--- libre/initscripts/initscripts.install | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'libre/initscripts') diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index 5fe5f654f..dd0d5b045 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer (Parabola): Nicolas Reynolds pkgname=initscripts -pkgver=2011.06.1 +pkgver=2011.06.3 pkgrel=1.1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('i686' 'x86_64') @@ -13,10 +13,11 @@ url="http://parabolagnulinux.org" license=('GPL2') groups=('base') backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless) -depends=('bash' 'grep' 'coreutils' 'udev>=167' - 'net-tools' 'ncurses' 'kbd' 'findutils' 'sysvinit') +depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=171' 'iproute2' + 'ncurses' 'kbd' 'findutils' 'sysvinit') optdepends=('bridge-utils: Network bridging support' 'dhcpcd: DHCP network configuration' + 'net-tools: legacy network support' 'wireless_tools: Wireless networking') install=initscripts.install source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2" @@ -27,3 +28,5 @@ package() { make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } +md5sums=('cbd4320b6b1790f8c1fd80917650a566' + '027576534885b8d5dded9be546057b12') diff --git a/libre/initscripts/initscripts.install b/libre/initscripts/initscripts.install index 360101c10..56f69248a 100644 --- a/libre/initscripts/initscripts.install +++ b/libre/initscripts/initscripts.install @@ -4,4 +4,8 @@ post_upgrade() { echo "==> Original file saved as /etc/inittab.pacsave" sed -i'.pacsave' 's#vc/\([0-9]\)#tty\1#' /etc/inittab fi + if [ "$(vercmp $2 2011.06.1)" -lt 0 ]; then + echo "Blacklisting of modules is no longer supported in rc.conf," + echo "please add blacklist entries to /etc/modprobe.d/ instead." + fi } -- cgit v1.2.3-54-g00ecf From 622de23541903f9b6f85fe0a96d61de08372d23b Mon Sep 17 00:00:00 2001 From: root Date: Fri, 10 Jun 2011 17:00:28 +0000 Subject: Fri Jun 10 17:00:28 UTC 2011 --- community/chntpw/PKGBUILD | 47 ++- community/john/PKGBUILD | 6 +- .../0001-filename-with-spaces-not-supported.patch | 345 ++++++++++++++++ community/libfm/PKGBUILD | 34 ++ community/libfm/libfm.install | 15 + community/luxrays/PKGBUILD | 22 +- community/luxrender/PKGBUILD | 26 +- community/lxde-common/PKGBUILD | 37 ++ community/lxde-common/lxde-common-arch.patch | 186 +++++++++ .../lxde-common/lxde-common-invalid-distfile.patch | 10 + community/lxde-common/lxde-common.install | 13 + community/lxdm/PKGBUILD | 49 +++ community/lxdm/Xsession.patch | 14 + community/lxdm/lxdm-daemon | 36 ++ community/lxdm/lxdm-pam.patch | 8 + community/lxdm/lxdm.install | 59 +++ community/lxdm/lxdm.patch | 26 ++ community/lxmenu-data/PKGBUILD | 25 ++ ...ssue-with-symbol-alarm-showing-up-on-F14-.patch | 43 ++ community/lxpanel/PKGBUILD | 30 ++ community/lxsession-lite/PKGBUILD | 29 ++ community/menu-cache/PKGBUILD | 29 ++ community/obconf/PKGBUILD | 35 ++ community/obconf/obconf.install | 12 + community/openbox/PKGBUILD | 47 +++ community/openbox/openbox.install | 4 + community/openbox/which-2.20.patch | 53 +++ community/pcmanfm/PKGBUILD | 30 ++ community/pcmanfm/pcmanfm.install | 14 + community/pcmanfm/revert-new-IPC.patch | 432 +++++++++++++++++++++ community/qtcreator/PKGBUILD | 12 +- community/quvi/PKGBUILD | 6 +- community/skrooge/PKGBUILD | 8 +- community/wvdial/PKGBUILD | 30 ++ community/wvstreams/PKGBUILD | 40 ++ community/xbindkeys/PKGBUILD | 26 ++ community/xplc/PKGBUILD | 32 ++ core/jfsutils/PKGBUILD | 7 +- extra/amule/PKGBUILD | 6 +- extra/clamav/PKGBUILD | 35 +- extra/clamav/conf.d | 8 + extra/clamav/install | 14 + extra/clamav/logrotate | 8 + extra/clamav/rc.d | 72 ++++ extra/icedtea-web/PKGBUILD | 44 +-- extra/qt/PKGBUILD | 110 +----- extra/vlc/PKGBUILD | 15 +- libre/initscripts/PKGBUILD | 6 +- libre/pacman/PKGBUILD | 28 +- libre/pacman/makepkg.conf | 6 +- libre/pacman/pacman.conf.mips64el | 95 +++++ libre/pacman/rePKGBUILD | 48 +-- testing/coreutils/PKGBUILD | 12 +- testing/net-tools/PKGBUILD | 25 +- testing/net-tools/net-tools.install | 12 + 55 files changed, 2162 insertions(+), 259 deletions(-) create mode 100644 community/libfm/0001-filename-with-spaces-not-supported.patch create mode 100644 community/libfm/PKGBUILD create mode 100644 community/libfm/libfm.install create mode 100644 community/lxde-common/PKGBUILD create mode 100644 community/lxde-common/lxde-common-arch.patch create mode 100644 community/lxde-common/lxde-common-invalid-distfile.patch create mode 100644 community/lxde-common/lxde-common.install create mode 100644 community/lxdm/PKGBUILD create mode 100644 community/lxdm/Xsession.patch create mode 100644 community/lxdm/lxdm-daemon create mode 100644 community/lxdm/lxdm-pam.patch create mode 100644 community/lxdm/lxdm.install create mode 100644 community/lxdm/lxdm.patch create mode 100644 community/lxmenu-data/PKGBUILD create mode 100644 community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch create mode 100644 community/lxpanel/PKGBUILD create mode 100644 community/lxsession-lite/PKGBUILD create mode 100644 community/menu-cache/PKGBUILD create mode 100644 community/obconf/PKGBUILD create mode 100644 community/obconf/obconf.install create mode 100644 community/openbox/PKGBUILD create mode 100644 community/openbox/openbox.install create mode 100644 community/openbox/which-2.20.patch create mode 100644 community/pcmanfm/PKGBUILD create mode 100644 community/pcmanfm/pcmanfm.install create mode 100644 community/pcmanfm/revert-new-IPC.patch create mode 100644 community/wvdial/PKGBUILD create mode 100644 community/wvstreams/PKGBUILD create mode 100644 community/xbindkeys/PKGBUILD create mode 100644 community/xplc/PKGBUILD create mode 100644 extra/clamav/conf.d create mode 100644 extra/clamav/install create mode 100644 extra/clamav/logrotate create mode 100644 extra/clamav/rc.d create mode 100644 libre/pacman/pacman.conf.mips64el create mode 100644 testing/net-tools/net-tools.install (limited to 'libre/initscripts') diff --git a/community/chntpw/PKGBUILD b/community/chntpw/PKGBUILD index 78c094e4a..bbbc62e13 100644 --- a/community/chntpw/PKGBUILD +++ b/community/chntpw/PKGBUILD @@ -1,29 +1,34 @@ -# $Id: PKGBUILD 91796 2010-09-28 06:24:38Z tpowa $ -# Maintainer: Tobias Powalowski +# $Id: PKGBUILD 48999 2011-06-09 15:13:27Z lfleischer $ +# Maintainer: Lukas Fleischer +# Contributor: Tobias Powalowski + pkgname=chntpw -pkgver=100627 +pkgver=110511 pkgrel=1 -pkgdesc="The Offline NT Password Editor - enables you to view some information and change user passwords in a Windows NT SAM userdatabase file" +pkgdesc='Offline NT Password Editor - reset passwords in a Windows NT SAM userdatabase file' arch=('i686' 'x86_64') -url="http://pogostick.net/~pnh/ntpasswd/" +url='http://pogostick.net/~pnh/ntpasswd/' license=('GPL' 'LGPL') makedepends=('openssl') -source=(http://pogostick.net/~pnh/ntpasswd/${pkgname}-source-${pkgver}.zip) -md5sums=('8b046c2073f27eed728e18635ba72dd4') -sha1sums=('4b2a7e7a406ca9ecb68c9ab4fb6012864828806d') +source=("http://pogostick.net/~pnh/ntpasswd/${pkgname}-source-${pkgver}.zip") +md5sums=('a3fb358d1adec589cd6bc8dedf68896c') build() { - if [ "$CARCH" = "x86_64" ]; then - cd ${srcdir}/${pkgname}-${pkgver} - sed -i "s|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall -m32|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall|" Makefile - fi - cd ${srcdir}/${pkgname}-${pkgver} - make - # install binaries, don't install static binaries! - install -Dm755 ${srcdir}/${pkgname}-${pkgver}/${pkgname} ${pkgdir}/usr/bin/${pkgname} - install -Dm755 ${srcdir}/${pkgname}-${pkgver}/reged ${pkgdir}/usr/bin/reged - install -Dm755 ${srcdir}/${pkgname}-${pkgver}/cpnt ${pkgdir}/usr/bin/cpnt - for doc in *.txt; do - install -Dm644 ${doc} ${pkgdir}/usr/share/doc/${pkgname}/${doc} - done + cd "${srcdir}/${pkgname}-${pkgver}" + + [ "$CARCH" = "x86_64" ] && sed -i "s|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall -m32|CFLAGS= -DUSEOPENSSL -g -I. -I\$(OSSLINC) -Wall|" Makefile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # install binaries, don't install static binaries! + install -Dm0755 "${srcdir}/${pkgname}-${pkgver}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}" + install -Dm0755 "${srcdir}/${pkgname}-${pkgver}/reged" "${pkgdir}/usr/bin/reged" + install -Dm0755 "${srcdir}/${pkgname}-${pkgver}/cpnt" "${pkgdir}/usr/bin/cpnt" + + for _f in *.txt; do + install -Dm0644 "${_f}" "${pkgdir}/usr/share/doc/${pkgname}/${_f}" + done } diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD index c4f02caa8..8830aa59b 100644 --- a/community/john/PKGBUILD +++ b/community/john/PKGBUILD @@ -6,8 +6,8 @@ pkgname=john pkgver=1.7.7 -pkgrel=2 -_jumbover=5 +pkgrel=3 +_jumbover=6 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)" arch=('i686' 'x86_64') url="http://www.openwall.com/$pkgname/" @@ -19,7 +19,7 @@ source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz params.h.patch) md5sums=('be316618de834a58573a21225d4a2674' - '40efadf002fb68d8287e60654593a531' + 'a9b0ca4d9d48480fc44b1986610d471a' 'c8d5c69f86c2eedb485583b0305284a1' 'f69ed632eba8fb9e45847a4b4a323787') diff --git a/community/libfm/0001-filename-with-spaces-not-supported.patch b/community/libfm/0001-filename-with-spaces-not-supported.patch new file mode 100644 index 000000000..568f6dc38 --- /dev/null +++ b/community/libfm/0001-filename-with-spaces-not-supported.patch @@ -0,0 +1,345 @@ +From 96fa31c757189c7c5f60d4de4c2df236d2cba0ea Mon Sep 17 00:00:00 2001 +From: Hong Jen Yee (PCMan) +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/community/libfm/PKGBUILD b/community/libfm/PKGBUILD new file mode 100644 index 000000000..c91a59bd3 --- /dev/null +++ b/community/libfm/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $ +# Maintainer: Angel Velasquez +# Maintainer: Juergen Hoetzel + +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/community/libfm/libfm.install b/community/libfm/libfm.install new file mode 100644 index 000000000..076da308e --- /dev/null +++ b/community/libfm/libfm.install @@ -0,0 +1,15 @@ +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/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD index 47f1abe5d..6c9f0e18a 100644 --- a/community/luxrays/PKGBUILD +++ b/community/luxrays/PKGBUILD @@ -1,28 +1,32 @@ -# $Id: PKGBUILD 48847 2011-06-06 14:44:47Z stativ $ +# $Id: PKGBUILD 49009 2011-06-09 16:49:54Z stativ $ # Maintainer: Lukas Jirkovsky pkgname=luxrays pkgver=0.8 _pkgver=ed424ec77571 -pkgrel=1 +pkgrel=2 epoch=0 pkgdesc="Accelerate the ray intersection process by using GPUs" arch=('i686' 'x86_64') url="http://www.luxrender.net/" license=('GPL') -depends=('freeimage' 'freeglut' 'glew' 'libgl' 'libcl') -makedepends=('cmake' 'boost' 'opencl-headers') -source=(http://src.luxrender.net/luxrays/archive/$_pkgver.tar.bz2) -md5sums=('32ac9ebd0a4de217fb3362494ce16a8e') +depends=('freeimage' 'freeglut' 'glew') +makedepends=('cmake' 'boost') +source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2) +md5sums=('386a3549376ac8240065232ae3294da4') build() { - cd "$srcdir/$pkgname-$_pkgver" + cd "$srcdir/luxrender-$pkgname-$_pkgver" - cmake -DCMAKE_INSTALL_PREFIX=/usr . + export CXXFLAGS="$CXXFLAGS -lpthread" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON \ + -DLUXRAYS_DISABLE_OPENCL=ON \ + . make } package() { - cd "$srcdir/$pkgname-$_pkgver" + cd "$srcdir/luxrender-$pkgname-$_pkgver" install -d -m755 "$pkgdir"/usr/{bin,include,lib} install -m755 bin/* "$pkgdir"/usr/bin diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD index 578bf6588..e2d4aa951 100644 --- a/community/luxrender/PKGBUILD +++ b/community/luxrender/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 49014 2011-06-09 17:05:59Z stativ $ # Maintainer: Lukas Jirkovsky # Initial contributor: flixie <69one@gmx.net> # Contributor: Imanol Celaya @@ -6,28 +7,31 @@ pkgver=0.8 _pkgver=45d3e13eb94c _luxblend=9cb3fcee0be8 _blender=2.57 -pkgrel=1 +pkgrel=2 pkgdesc="Rendering system for physically correct, unbiased image synthesis" arch=('i686' 'x86_64') url="http://www.luxrender.net/" license=('GPL') -depends=('boost-libs' 'luxrays' 'openexr') +depends=('boost-libs' 'freeimage' 'openexr') optdepends=('blender: Blender exporter' 'qt: Qt GUI') -makedepends=('cmake' 'boost' 'qt' 'opencl-headers') -source=(http://src.luxrender.net/lux/archive/$_pkgver.tar.bz2 - http://src.luxrender.net/luxblend25/archive/$_luxblend.tar.bz2) -md5sums=('ad8d2ede00aa244cad884d9696ff5fbb' - '29c34f97791db3af1b827d9e9a1b3d79') +makedepends=('cmake' 'boost' 'qt' 'luxrays') +source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2 \ + https://bitbucket.org/luxrender/luxblend25/get/$_luxblend.tar.bz2) +md5sums=('0f2d856385db72131f51e44a7ee527fa' + '0c3c8d9efba76133f8c687b5dd2bca8a') build() { - cd "$srcdir"/lux-$_pkgver + cd "$srcdir"/luxrender-lux-$_pkgver - cmake -DCMAKE_INSTALL_PREFIX=/usr . + export CXXFLAGS="$CXXFLAGS -lpthread" + cmake -DCMAKE_INSTALL_PREFIX=/usr \ + -DLUXRAYS_DISABLE_OPENCL=ON \ + . make } package() { - cd "$srcdir"/lux-$_pkgver + cd "$srcdir"/luxrender-lux-$_pkgver make DESTDIR="$pkgdir" install # fix library path on x86_64 @@ -35,7 +39,7 @@ package() { # install blender exporter install -d -m755 "$pkgdir"/usr/share/blender/$_blender/scripts/addons - cp -a "$srcdir"/luxblend25-$_luxblend/src/luxrender \ + cp -a "$srcdir"/luxrender-luxblend25-$_luxblend/src/luxrender \ "$pkgdir"/usr/share/blender/$_blender/scripts/addons } diff --git a/community/lxde-common/PKGBUILD b/community/lxde-common/PKGBUILD new file mode 100644 index 000000000..b2516b833 --- /dev/null +++ b/community/lxde-common/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $ +# Maintainer: Angel Velasquez +# Maintainer: Juergen Hoetzel + +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/lxde/${pkgname}-${pkgver}.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 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 lxde-logout.desktop \ + ${pkgdir}/usr/share/applications/lxde-logout.desktop +} diff --git a/community/lxde-common/lxde-common-arch.patch b/community/lxde-common/lxde-common-arch.patch new file mode 100644 index 000000000..3aa1a8992 --- /dev/null +++ b/community/lxde-common/lxde-common-arch.patch @@ -0,0 +1,186 @@ +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 @@ + + + yes +- pcmanfm --show-pref 2 ++ pcmanfm --desktop-pref + + + +@@ -43,4 +43,4 @@ + + + +- +\ No newline at end of file ++ +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/community/lxde-common/lxde-common-invalid-distfile.patch b/community/lxde-common/lxde-common-invalid-distfile.patch new file mode 100644 index 000000000..df5d68084 --- /dev/null +++ b/community/lxde-common/lxde-common-invalid-distfile.patch @@ -0,0 +1,10 @@ +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/community/lxde-common/lxde-common.install b/community/lxde-common/lxde-common.install new file mode 100644 index 000000000..d2226670d --- /dev/null +++ b/community/lxde-common/lxde-common.install @@ -0,0 +1,13 @@ +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} +} diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD new file mode 100644 index 000000000..618566d6e --- /dev/null +++ b/community/lxdm/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $ +# Maintainer: AndyRTR +# Contributor: kiefer + +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') +depends=('gtk2' 'xorg-server' 'consolekit') +makedepends=('intltool') +install=${pkgname}.install +backup=('etc/lxdm/lxdm.conf') # 'etc/lxdm/xinitrc') +source=("http://downloads.sourceforge.net/lxde/$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 + + install -m644 ${srcdir}/lxdm-pam.patch ${pkgdir}/etc/pam.d/lxdm + install -Dm755 ${srcdir}/lxdm-daemon ${pkgdir}/etc/rc.d/lxdm + + # these files are not in the package, but should be owned by lxdm - taken from Fedora pkg +# touch ${pkgdir}/etc/lxdm/xinitrc + install -d ${pkgdir}/var/{lib,run}/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/community/lxdm/Xsession.patch b/community/lxdm/Xsession.patch new file mode 100644 index 000000000..a9ba63233 --- /dev/null +++ b/community/lxdm/Xsession.patch @@ -0,0 +1,14 @@ +--- 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/community/lxdm/lxdm-daemon b/community/lxdm/lxdm-daemon new file mode 100644 index 000000000..68eb6225d --- /dev/null +++ b/community/lxdm/lxdm-daemon @@ -0,0 +1,36 @@ +#!/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/community/lxdm/lxdm-pam.patch b/community/lxdm/lxdm-pam.patch new file mode 100644 index 000000000..3f5df04a7 --- /dev/null +++ b/community/lxdm/lxdm-pam.patch @@ -0,0 +1,8 @@ +#%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/community/lxdm/lxdm.install b/community/lxdm/lxdm.install new file mode 100644 index 000000000..8d42de90f --- /dev/null +++ b/community/lxdm/lxdm.install @@ -0,0 +1,59 @@ +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/community/lxdm/lxdm.patch b/community/lxdm/lxdm.patch new file mode 100644 index 000000000..a703a386d --- /dev/null +++ b/community/lxdm/lxdm.patch @@ -0,0 +1,26 @@ +--- 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/community/lxmenu-data/PKGBUILD b/community/lxmenu-data/PKGBUILD new file mode 100644 index 000000000..3efe37218 --- /dev/null +++ b/community/lxmenu-data/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $ +# Maintainer: Angel Velasquez +# Maintainer: Juergen Hoetzel + +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/lxde/$pkgname-$pkgver.tar.gz") +md5sums=('cee3181dd22088f3db0e99ffbedc986d') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch b/community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch new file mode 100644 index 000000000..e3da3d897 --- /dev/null +++ b/community/lxpanel/Fix-build-issue-with-symbol-alarm-showing-up-on-F14-.patch @@ -0,0 +1,43 @@ +From 4a974f2686d2fafdcda4a180b0483a7b17fd2d71 Mon Sep 17 00:00:00 2001 +From: Marty Jack +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/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD new file mode 100644 index 000000000..505c7a27a --- /dev/null +++ b/community/lxpanel/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $ +# Maintainer: Angel Velasquez +# Maintainer: Juergen Hoetzel + +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/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 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community/lxsession-lite/PKGBUILD b/community/lxsession-lite/PKGBUILD new file mode 100644 index 000000000..8e56e74f5 --- /dev/null +++ b/community/lxsession-lite/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $ +# Maintainer: Angel Velasquez +# Maintainer: Juergen Hoetzel + +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/lxde/lxsession-${pkgver}.tar.gz) +md5sums=('d5cd0cb733748191b2c7371c9efda155') + +build() { + cd "$srcdir/lxsession-$pkgver" + ./configure --sysconfdir=/etc --prefix=/usr + make +} + +package() { + cd "$srcdir/lxsession-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community/menu-cache/PKGBUILD b/community/menu-cache/PKGBUILD new file mode 100644 index 000000000..693f22de8 --- /dev/null +++ b/community/menu-cache/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $ +# Maintainer: Angel Velasquez +# Maintainer: Juergen Hoetzel + +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/lxde/${pkgname}-${pkgver}.tar.gz) +md5sums=('ac4a9ea77db68d3db3f9f53cc75af66a') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/menu-cache --disable-static + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/community/obconf/PKGBUILD b/community/obconf/PKGBUILD new file mode 100644 index 000000000..63755ce33 --- /dev/null +++ b/community/obconf/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 49029 2011-06-09 21:05:36Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino +# Contributor: Tobias Kieslich +# Contributor: Daniel J Griffiths + +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/community/obconf/obconf.install b/community/obconf/obconf.install new file mode 100644 index 000000000..3121bf3ea --- /dev/null +++ b/community/obconf/obconf.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + update-mime-database /usr/share/mime 1> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD new file mode 100644 index 000000000..d980675be --- /dev/null +++ b/community/openbox/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 49029 2011-06-09 21:05:36Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino +# Contributor: tobias + +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') +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 + sed -i 's#python#python2#' tools/xdg-autostart/xdg-autostart + ./configure --prefix=/usr \ + --with-x \ + --enable-startup-notification \ + --sysconfdir=/etc + make +} + +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/community/openbox/openbox.install b/community/openbox/openbox.install new file mode 100644 index 000000000..a8088b4db --- /dev/null +++ b/community/openbox/openbox.install @@ -0,0 +1,4 @@ +post_install() { + echo "Place menu.xml, rc.xml and autostart.sh in ~/.config/openbox" + echo "They can be found in /etc/xdg/openbox" +} diff --git a/community/openbox/which-2.20.patch b/community/openbox/which-2.20.patch new file mode 100644 index 000000000..7f663ae49 --- /dev/null +++ b/community/openbox/which-2.20.patch @@ -0,0 +1,53 @@ +--- 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/community/pcmanfm/PKGBUILD b/community/pcmanfm/PKGBUILD new file mode 100644 index 000000000..ef93d7cc9 --- /dev/null +++ b/community/pcmanfm/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 49034 2011-06-09 21:26:14Z andrea $ +# Maintainer: Angel Velasquez +# Maintainer: Juergen Hoetzel + +pkgname=pcmanfm +pkgver=0.9.8 +pkgrel=6 +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' 'lxmenu-data') +makedepends=('intltool' 'pkgconfig') +source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-$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/community/pcmanfm/pcmanfm.install b/community/pcmanfm/pcmanfm.install new file mode 100644 index 000000000..98965c989 --- /dev/null +++ b/community/pcmanfm/pcmanfm.install @@ -0,0 +1,14 @@ +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/community/pcmanfm/revert-new-IPC.patch b/community/pcmanfm/revert-new-IPC.patch new file mode 100644 index 000000000..fa64fde42 --- /dev/null +++ b/community/pcmanfm/revert-new-IPC.patch @@ -0,0 +1,432 @@ +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 + /* socket is used to keep single instance */ + #include ++#include ++#include + #include + #include /* 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/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index 4962430fc..89215fa3f 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48974 2011-06-09 02:24:35Z svenstaro $ +# $Id: PKGBUILD 48989 2011-06-09 09:28:42Z svenstaro $ # Maintainer: Imanol Celaya # Maintainer: Sven-Hendrik Haase # Contributor: Lukas Jirkovsky @@ -11,7 +11,7 @@ pkgbase=qtcreator #pkgname=('qtcreator' 'qtcreator-todo-plugin' 'qtcreator-artisticstyle-plugin') pkgname=('qtcreator' 'qtcreator-todo-plugin') pkgver=2.2.0 -pkgrel=2 +pkgrel=3 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64') url='http://qt.nokia.com/products/developer-tools' @@ -64,6 +64,14 @@ package_qtcreator() { make INSTALL_ROOT="${pkgdir}/usr/" install + # qt already fixed this + if [[ -f "$pkgdir/usr/bin/qmlpuppet" ]]; then + echo "Remove this manual install as it is now unnecessary (probably qtcreator 2.2.1)" + return 1 + fi + install -Dm755 bin/qmlpuppet "$pkgdir/usr/bin/qmlpuppet" + # remove it soon + install -Dm644 ${srcdir}/qtcreator.desktop \ ${pkgdir}/usr/share/applications/qtcreator.desktop install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT \ diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD index 7a4c6beee..a124c5e8a 100644 --- a/community/quvi/PKGBUILD +++ b/community/quvi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 45360 2011-04-20 15:12:08Z lfleischer $ +# $Id: PKGBUILD 48994 2011-06-09 14:59:59Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: joyfulgirl@archlinux.us pkgname=quvi -pkgver=0.2.15 +pkgver=0.2.16 pkgrel=1 pkgdesc='Command-line tool for parsing video download links.' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('LGPL') depends=('curl' 'pcre' 'lua') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('7cda6c6593c1281e89d91de3b0bed284') +md5sums=('43ac4c1ecaace175e2e8b38f4566a710') build() { cd "${pkgname}-${pkgver}" diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD index 6805f7ae6..e6c628896 100644 --- a/community/skrooge/PKGBUILD +++ b/community/skrooge/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 42177 2011-03-15 08:11:50Z schiv $ +# $Id: PKGBUILD 48984 2011-06-09 06:50:51Z schiv $ # Maintainer: Ray Rashif # Contributor: Andrea Scarpino # Contributor: neuromante pkgname=skrooge -pkgver=0.8.1 +pkgver=0.9.0 pkgrel=1 pkgdesc="A personal finances manager for KDE" arch=('i686' 'x86_64') @@ -14,13 +14,13 @@ depends=('kdebase-runtime' 'libofx' 'qca-ossl') makedepends=('cmake' 'automoc4' 'docbook-xsl') install=$pkgname.install source=("http://skrooge.org/files/$pkgname-$pkgver.tar.bz2") -md5sums=('417f5668d9ec07b715c8fc7023460c27') +md5sums=('340cbec2ddc2a258bd9b5091dbdb5e92') build() { cd "$srcdir/$pkgname-$pkgver" cmake . -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/community/wvdial/PKGBUILD b/community/wvdial/PKGBUILD new file mode 100644 index 000000000..8edab9e52 --- /dev/null +++ b/community/wvdial/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 49019 2011-06-09 20:53:15Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino +# Contributor: dorphell + +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/community/wvstreams/PKGBUILD b/community/wvstreams/PKGBUILD new file mode 100644 index 000000000..5be8bf94f --- /dev/null +++ b/community/wvstreams/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 49019 2011-06-09 20:53:15Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino +# Contributor: dorphell + +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 +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + + # 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/community/xbindkeys/PKGBUILD b/community/xbindkeys/PKGBUILD new file mode 100644 index 000000000..8e979b07a --- /dev/null +++ b/community/xbindkeys/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 49026 2011-06-09 20:58:03Z andrea $ +# Maintainer: +# Contributor: Daniel J Griffiths +# Contributor: Thayer Williams + +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' 'tk') +source=(http://www.nongnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('4b66a05594dbc6888c0a6439351aa66d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/community/xplc/PKGBUILD b/community/xplc/PKGBUILD new file mode 100644 index 000000000..bc029a87c --- /dev/null +++ b/community/xplc/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 49019 2011-06-09 20:53:15Z andrea $ +# Maintainer: +# Contributor: dorphell + +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/${pkgname}/$pkgname-$pkgver.tar.gz") +md5sums=('39da3270527c8712b8e8fcf03768d29f') +options=('!buildflags') + +build() { + cd $srcdir/$pkgname-$pkgver + + ./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/core/jfsutils/PKGBUILD b/core/jfsutils/PKGBUILD index 1d99ac5d3..f0342bad0 100644 --- a/core/jfsutils/PKGBUILD +++ b/core/jfsutils/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 100375 2010-11-23 01:27:06Z stephane $ +# $Id: PKGBUILD 126948 2011-06-08 20:07:37Z tpowa $ # Maintainer: Tobias Powalowski pkgname=jfsutils -pkgver=1.1.14 +pkgver=1.1.15 pkgrel=2 pkgdesc="JFS filesystem utilities" arch=(i686 x86_64) @@ -10,7 +10,7 @@ license=('GPL') groups=('base') depends=('util-linux-ng') source=(http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz) -md5sums=('05150840987176d5e8438066b80add1a') +md5sums=('8809465cd48a202895bc2a12e1923b5d') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -22,4 +22,3 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install } - diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index cb362d105..81ba44c7d 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 124068 2011-05-16 14:49:29Z giovanni $ +# $Id: PKGBUILD 127014 2011-06-09 16:03:48Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Henrik Ronellenfitsch # Contributor: Alessio Sergi # Contributor: Dario 'Dax' Vilardi pkgname=amule -pkgver=10561 +pkgver=10576 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('1f8957c35e8bd2496aa83b5ba318f9bd') +md5sums=('1a1f01d356b3d2d5c01004018ffa79c6') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index 983458e51..35dc54939 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,35 +1,40 @@ -# $Id: PKGBUILD 109346 2011-02-08 18:56:38Z bisson $ -# Maintainer: Dale Blount +# $Id: PKGBUILD 127029 2011-06-09 21:38:42Z bisson $ +# Contributor: Dale Blount # Contributor: Gregor Ibic +# Maintainer: Gaetan Bisson pkgname=clamav -pkgver=0.97 +pkgver=0.97.1 pkgrel=1 pkgdesc='Anti-virus toolkit for Unix' arch=('i686' 'x86_64') depends=('bzip2' 'zlib' 'libtool') options=('!libtool') -install="$pkgname.install" license=('GPL') backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav') url='http://www.clamav.net/' source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" - 'clamav' - 'clamav.confd' - 'clamav.logrotate' + 'rc.d' + 'conf.d' + 'logrotate' 'config.patch') - -sha1sums=('68f5a6736b3f67d608c4064ef839777877f09115' +sha1sums=('1b3a4667dcc278bc7eab38acbc0f35269aa05387' '7f15f0b13a1c11235bc99ef0add01efd8a442f07' 'cb116cdab49a810381a515cbcfb6a6c148547f07' 'be3310d2b41a68ce06e33c84ab68ffe59fdce104' '701a61571788d10ff7af01597785835c6bfea918') +install=install + build() { cd "$srcdir/$pkgname-$pkgver" patch -p1 < ../config.patch - ./configure --prefix=/usr --sysconfdir=/etc/clamav \ - --with-dbdir=/var/lib/clamav --disable-clamav + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc/clamav \ + --with-dbdir=/var/lib/clamav \ + --disable-clamav \ + make } @@ -37,14 +42,14 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - # make sure conf files get installed, cause make install + # make sure conf files get installed, because make install # doesn't do that if clamav is already installed upon building. install -D -m644 etc/clamd.conf "$pkgdir/etc/clamav/clamd.conf" install -D -m644 etc/freshclam.conf "$pkgdir/etc/clamav/freshclam.conf" - install -D -m644 ../clamav.logrotate "$pkgdir/etc/logrotate.d/clamav" - install -D -m644 ../clamav.confd "$pkgdir/etc/conf.d/clamav" - install -D -m755 ../clamav "$pkgdir/etc/rc.d/clamav" + install -D -m644 ../logrotate "$pkgdir/etc/logrotate.d/clamav" + install -D -m644 ../conf.d "$pkgdir/etc/conf.d/clamav" + install -D -m755 ../rc.d "$pkgdir/etc/rc.d/clamav" # un-distribute databases to require freshclam rm "$pkgdir"/var/lib/clamav/*.cvd diff --git a/extra/clamav/conf.d b/extra/clamav/conf.d new file mode 100644 index 000000000..9cd44d9f8 --- /dev/null +++ b/extra/clamav/conf.d @@ -0,0 +1,8 @@ +# 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/install b/extra/clamav/install new file mode 100644 index 000000000..9116dc394 --- /dev/null +++ b/extra/clamav/install @@ -0,0 +1,14 @@ +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/logrotate b/extra/clamav/logrotate new file mode 100644 index 000000000..d1dc94dce --- /dev/null +++ b/extra/clamav/logrotate @@ -0,0 +1,8 @@ +/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/clamav/rc.d b/extra/clamav/rc.d new file mode 100644 index 000000000..8e9c6afa9 --- /dev/null +++ b/extra/clamav/rc.d @@ -0,0 +1,72 @@ +#!/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/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD index 19cd1fd16..95dbb9933 100644 --- a/extra/icedtea-web/PKGBUILD +++ b/extra/icedtea-web/PKGBUILD @@ -1,57 +1,56 @@ -# $Id: PKGBUILD 117733 2011-04-04 17:37:15Z andyrtr $ +# $Id: PKGBUILD 127010 2011-06-09 16:03:05Z andyrtr $ # Maintainer: Andreas Radke pkgbase=icedtea-web pkgname=('icedtea-web' 'icedtea-web-doc') -pkgver=1.0.2 -pkgrel=1 +pkgver=1.1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('openjdk6' 'zip' 'xulrunner') -install=$pkgname.install -source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz - fix-man-location.patch) -md5sums=('4b5d80f4b82e53f4947e6782a0472d54' - '58e305aa0d27d59f543d9cfddc6e175a') +source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz) +md5sums=('a7d70cb446c38213e554d4bdfb926f63') build() { _javaver=6 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk cd "$srcdir/$pkgname-$pkgver" - patch -Np0 -i $srcdir/fix-man-location.patch - autoreconf -v ./configure --prefix=/usr/lib/jvm/java-6-openjdk \ --datarootdir=/usr/share make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + + package_icedtea-web() { pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project" depends=('openjdk6' 'gtk2' 'desktop-file-utils') - - if [ "${CARCH}" = "x86_64" ]; then - _arch=amd64 - else - _arch=i586 - fi + install=$pkgname.install _javaver=6 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + # possible make target (see bottom of Makefile.am: install-exec-local install-data-local + make DESTDIR="$pkgdir" install-exec-local install-data-local + # Install desktop files. install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps} install -m644 javaws.png ${pkgdir}/usr/share/pixmaps install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications # remove splitted doc files - rm -vrf ${pkgdir}/usr/share/doc + rm -rf ${pkgdir}/usr/share/doc # link binaries into /usr/bin + jre/bin install -m755 -d ${pkgdir}/usr/bin + install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin pushd ${pkgdir}/${_jvmdir}/bin for file in *; do ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin @@ -61,7 +60,7 @@ package_icedtea-web() { # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/ - ln -sf ${_jvmdir}/jre/lib/${_arch/i586/i386}/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ + ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ } package_icedtea-web-doc() { @@ -72,11 +71,12 @@ package_icedtea-web-doc() { _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk cd "$srcdir/$pkgbase-$pkgver" - install -m755 -d $pkgdir/${_jvmdir}/jre/lib +# install -m755 -d $pkgdir/${_jvmdir}/jre/lib make DESTDIR="$pkgdir" install-data-local # remove javaws about and man page - rm -vrf ${pkgdir}/usr/lib - rm -vrf ${pkgdir}/usr/share/man + rm -rf ${pkgdir}/usr/lib + rm -rf ${pkgdir}/usr/share/man + rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems } # plugin test here http://www.java.com/en/download/help/testvm.xml \ No newline at end of file diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 89e96034f..44a2cff98 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 125344 2011-05-26 00:12:04Z andrea $ +# $Id: PKGBUILD 126981 2011-06-09 07:23:06Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.7.3 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://qt.nokia.com/' license=('GPL3' 'LGPL') @@ -32,6 +32,9 @@ build() { export PATH=${QT4DIR}/bin:${PATH} export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + # FS#24601 + export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" + cd $srcdir/$_pkgfqn # Already fixed upstream @@ -125,98 +128,15 @@ package_qt-private-headers(){ pkgdesc="Qt private headers for development" depends=("qt=${pkgver}") - install -d ${pkgdir}/usr/include/phonon/private - cd ${srcdir}/$_pkgfqn/src/3rdparty/phonon/phonon/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/phonon/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/Qt3Support/private - cd ${srcdir}/$_pkgfqn/src/qt3support/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/Qt3Support/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtCore/private - cd ${srcdir}/$_pkgfqn/src/corelib/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtCore/private/ \; &> /dev/null + install -d ${pkgdir}/usr/include/{QtCore,QtDeclarative,QtGui,QtScript} + install -d ${pkgdir}/usr/src/{corelib,declarative,gui,script} - install -d ${pkgdir}/usr/include/QtDBus/private - cd ${srcdir}/$_pkgfqn/src/dbus/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtDBus/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtDeclarative/private - cd ${srcdir}/$_pkgfqn/src/declarative/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtDeclarative/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtDesigner/private - cd ${srcdir}/$_pkgfqn/tools/designer/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtDesigner/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtGui/private - cd ${srcdir}/$_pkgfqn/src/gui/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtGui/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtHelp/private - cd ${srcdir}/$_pkgfqn/tools/assistant/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtHelp/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtMultimedia/private - cd ${srcdir}/$_pkgfqn/src/multimedia/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtMultimedia/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtNetwork/private - cd ${srcdir}/$_pkgfqn/src/network/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtNetwork/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtOpenGL/private - cd ${srcdir}/$_pkgfqn/src/opengl/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtOpenGL/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtScript/private - cd ${srcdir}/$_pkgfqn/src/script/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtScript/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtScriptTools/private - cd ${srcdir}/$_pkgfqn/src/scripttools/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtScriptTools/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtSql/private - cd ${srcdir}/$_pkgfqn/src/sql/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtSql/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtSvg/private - cd ${srcdir}/$_pkgfqn/src/svg/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtSvg/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtTest/private - cd ${srcdir}/$_pkgfqn/src/testlib/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtTest/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtUiTools/private - cd ${srcdir}/$_pkgfqn/tools/designer/src/uitools - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtUiTools/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtWebKit/private - cd ${srcdir}/$_pkgfqn/src/3rdparty/webkit - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtWebKit/private/ \; &> /dev/null - - install -d ${pkgdir}/usr/include/QtXmlPatterns/private - cd ${srcdir}/$_pkgfqn/src/xmlpatterns/ - find . -name "*_p.h" -exec install -m644 {} \ - ${pkgdir}/usr/include/QtXmlPatterns/private/ \; &> /dev/null + for i in QtCore QtDeclarative QtGui QtScript; do + cp -r ${srcdir}/$_pkgfqn/include/${i}/private/ \ + ${pkgdir}/usr/include/${i}/ + done + + for i in corelib declarative gui script; do + cp -r ${srcdir}/$_pkgfqn/src/${i} ${pkgdir}/usr/src/ + done } diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index f3b47e7ca..ecdad6626 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 126600 2011-06-06 13:01:06Z giovanni $ +# $Id: PKGBUILD 126993 2011-06-09 15:41:16Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Sarah Hay # Contributor: Martin Sandsmark pkgname=vlc pkgver=1.1.10 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" license=('GPL') depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libcdio' - 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' - 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' - 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' - 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' - 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') + 'libdca' 'qt' 'libproxy' 'sdl_image' 'libdvdnav' 'mesa' + 'lua' 'v4l-utils' 'libcddb' 'smbclient' 'libmatroska' 'zvbi' + 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' + 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' + 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') makedepends=('avahi' 'pkgconfig' 'libxpm' 'live-media' 'libnotify' 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' @@ -52,6 +52,7 @@ build() { --enable-pvr \ --enable-ncurses \ --with-live555-tree=/usr/lib/live \ + --enable-upnp \ --enable-realrtsp make } diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index dd0d5b045..bb255b4aa 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer (Parabola): Nicolas Reynolds pkgname=initscripts -pkgver=2011.06.3 +pkgver=2011.06.4 pkgrel=1.1 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('i686' 'x86_64') @@ -22,11 +22,11 @@ optdepends=('bridge-utils: Network bridging support' install=initscripts.install source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2" 'wireless.conf.d') +md5sums=('de758f8da0552555135f53bd7184966a' + '027576534885b8d5dded9be546057b12') package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } -md5sums=('cbd4320b6b1790f8c1fd80917650a566' - '027576534885b8d5dded9be546057b12') diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index dfdc56f09..236cc27f4 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $ +# $Id: PKGBUILD 126847 2011-06-07 19:50:19Z dan $ # Maintainer: Dan McGee pkgname=pacman -pkgver=3.5.2 -pkgrel=1.1 +pkgver=3.5.3 +pkgrel=1 pkgdesc="A library-based package manager with dependency support" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" license=('GPL') groups=('base') @@ -18,11 +18,13 @@ options=(!libtool) source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf pacman.conf.x86_64 + pacman.conf.mips64el makepkg.conf) -md5sums=('b4f1fdbc17100923071ebe8fe9377be5' +md5sums=('c36c18ed4d8ec69c0ecb4f9684266901' 'c7e6dbee04b7c492febea4366519b91d' '8809642ed398d2b9b98c5974b8b5e348' - 'a8684989d3dfad5a6e1bcf95af3e571b') + '4139efd9cc65aef199de1ebace9d9e84' + 'be10d3d2e533515a0470237761415568') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' @@ -45,13 +47,22 @@ package() { install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf mycarch="i686" mychost="i686-pc-linux-gnu" - myflags="-march=i686 " + myflags="-march=i686 -mtune=generic -O2 -pipe" + myldflags="-Wl,--hash-style=gnu -Wl,--as-needed" ;; x86_64) install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf mycarch="x86_64" mychost="x86_64-unknown-linux-gnu" - myflags="-march=x86-64 " + myflags="-march=x86-64 -mtune=generic -O2 -pipe" + myldflags="-Wl,--hash-style=gnu -Wl,--as-needed" + ;; + mips64el) + install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf + mycarch="mips64el" + mychost="mips64el-unknown-linux-gnu" + myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop" + myldflags="" ;; esac install -m644 $srcdir/makepkg.conf $pkgdir/etc/ @@ -59,6 +70,7 @@ package() { sed -i $pkgdir/etc/makepkg.conf \ -e "s|@CARCH[@]|$mycarch|g" \ -e "s|@CHOST[@]|$mychost|g" \ + -e "s|@LDFLAGS[@]|$myldflags|g" \ -e "s|@CARCHFLAGS[@]|$myflags|g" # install completion files diff --git a/libre/pacman/makepkg.conf b/libre/pacman/makepkg.conf index a655e935f..bfa971b7b 100644 --- a/libre/pacman/makepkg.conf +++ b/libre/pacman/makepkg.conf @@ -29,9 +29,9 @@ CHOST="@CHOST@" #-- Exclusive: will only run on @CARCH@ # -march (or -mcpu) builds exclusively for an architecture # -mtune optimizes for an architecture, but builds for whole processor family -CFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" -CXXFLAGS="@CARCHFLAGS@-mtune=generic -O2 -pipe" -LDFLAGS="-Wl,--hash-style=gnu -Wl,--as-needed" +CFLAGS="@CARCHFLAGS@" +CXXFLAGS="@CARCHFLAGS@" +LDFLAGS="@LDFLAGS@" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el new file mode 100644 index 000000000..8290fbf1d --- /dev/null +++ b/libre/pacman/pacman.conf.mips64el @@ -0,0 +1,95 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +HoldPkg = pacman glibc +# If upgrades are available for these packages they will be asked for first +SyncFirst = pacman +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#XferCommand = /usr/bin/curl -C - -f %u > %o +#CleanMethod = KeepInstalled +Architecture = mips64el + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options (all disabled by default) +#UseSyslog +#ShowSize +#UseDelta +#TotalDownload +#CheckSpace + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[libre-testing] +#Include = /etc/pacman.d/mirrorlist + +[libre] +Include = /etc/pacman.d/mirrorlist + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +#[community-testing] +#Include = /etc/pacman.d/mirrorlist + +[community] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +#[multilib] +#Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#Server = file:///home/custompkgs + diff --git a/libre/pacman/rePKGBUILD b/libre/pacman/rePKGBUILD index 251d44d72..af613dc74 100644 --- a/libre/pacman/rePKGBUILD +++ b/libre/pacman/rePKGBUILD @@ -1,39 +1,30 @@ -# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $ -# Maintainer: Dan McGee - -pkgname=pacman -pkgver=3.5.2 -pkgrel=1.2 -_pkgrel=1 -pkgdesc="A library-based package manager with dependency support" -arch=('i686' 'x86_64') -url="http://www.archlinux.org/pacman/" -license=('GPL') -groups=('base') -depends=('bash' 'libarchive>=2.8.4' 'libfetch>=2.28' 'pacman-mirrorlist-libre') -optdepends=('fakeroot: for makepkg usage as normal user' - 'curl: for rankmirrors usage') -backup=(etc/pacman.conf etc/makepkg.conf) -install=pacman.install -options=(!libtool !strip) -source=(http://repo.parabolagnulinux.org/core/os/$CARCH/$pkgname-$pkgver-$_pkgrel-$CARCH.pkg.tar.gz - pacman.conf - pacman.conf.x86_64 - makepkg.conf) - -# keep an upgrade path for older installations -PKGEXT='.pkg.tar.gz' +# Maintainer: Nicolas Reynolds +source PKGBUILD +CARCH=x86_64 +unset build package md5sums source +_repo=core +source=(PKGBUILD + http://mirrors.kernel.org/archlinux/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT + # files for pkg modifications + pacman.conf + pacman.conf.x86_64 + ) +options=(!strip) build() { cd "${srcdir}/" - rm .{INSTALL,PKGINFO} $pkgname-$pkgver-$_pkgrel-$CARCH.pkg.tar.gz + rm .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT + # put actions for package modifications below this line } package() { + cd ${srcdir} cp -a ./* ${pkgdir} - rm $pkgdir/etc/pacman.conf $pkgdir/{pacman.conf{,.x86_64},makepkg.conf} + rm ${pkgdir}/{PKGBUILD,pacman.conf{,.x86_64}} + +# No need to repackage for mips64el case "$CARCH" in i686) install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf @@ -44,4 +35,5 @@ package() { esac } -# vim: set ts=2 sw=2 et: + +# vim:set ts=2 sw=2 et: diff --git a/testing/coreutils/PKGBUILD b/testing/coreutils/PKGBUILD index 8fdbe0149..6d75f0659 100644 --- a/testing/coreutils/PKGBUILD +++ b/testing/coreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126199 2011-06-02 14:37:57Z bisson $ +# $Id: PKGBUILD 127042 2011-06-10 00:56:53Z bisson $ # Maintainer: Allan McRae # Contributor: judd pkgname=coreutils pkgver=8.12 -pkgrel=2 +pkgrel=3 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64') license=('GPL3') @@ -35,8 +35,8 @@ build() { autoreconf -v ./configure --prefix=/usr \ - --enable-install-program=su,hostname \ - --enable-no-install-program=groups,kill,uptime \ + --enable-install-program=su \ + --enable-no-install-program=groups,hostname,kill,uptime \ --enable-pam make } @@ -54,8 +54,8 @@ package() { install -dm755 ${pkgdir}/{bin,usr/sbin} # binaries required by FHS - _fhs="cat chgrp chmod chown cp date dd df echo false hostname \ - ln ls mkdir mknod mv pwd rm rmdir stty su sync true uname" + _fhs="cat chgrp chmod chown cp date dd df echo false ln ls \ + mkdir mknod mv pwd rm rmdir stty su sync true uname" mv ${_fhs} ${pkgdir}/bin # binaries required by various Arch scripts diff --git a/testing/net-tools/PKGBUILD b/testing/net-tools/PKGBUILD index d9b2380bc..6a81124ea 100644 --- a/testing/net-tools/PKGBUILD +++ b/testing/net-tools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 126212 2011-06-02 16:50:35Z bisson $ +# $Id: PKGBUILD 127037 2011-06-10 00:48:19Z bisson $ # Maintainer: judd pkgname=net-tools pkgver=1.60 -pkgrel=16 +pkgrel=18 pkgdesc="Configuration tools for Linux networking" arch=(i686 x86_64) license=('GPL') @@ -14,13 +14,7 @@ source=(http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2 net-tools-1.60-nameif.patch net-tools-1.60-nameif_strncpy.patch) options=(!makeflags) -md5sums=('888774accab40217dde927e21979c165' - '7ef8d0c6818faa0fdeea94970a20e3fb' - 'b52d899cba9956bb0055150506f41ac1' - '51de6eabe2d6d6dc860f72c41cee636b' - 'c16109863bc63f3dad4ef35305a340bb' - '29a32617382fab1735acba4d920f1fcd' - 'e66466b9304dac85eb42b32f1ec3b284') +install=net-tools.install build() { cd $srcdir/$pkgname-$pkgver @@ -37,7 +31,14 @@ package() { cd $srcdir/$pkgname-$pkgver make BASEDIR=$pkgdir update - # the following is provided by yp-tools and coreutils - rm "${pkgdir}"/bin/{{,dns,nis,yp}domainname,hostname} - rm "${pkgdir}"/usr/share/man/man1/{{,dns,nis,yp}domainname,hostname}.1 + # the following is provided by yp-tools + rm "${pkgdir}"/bin/{nis,yp}domainname + rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1 } +md5sums=('888774accab40217dde927e21979c165' + '7ef8d0c6818faa0fdeea94970a20e3fb' + 'b52d899cba9956bb0055150506f41ac1' + '51de6eabe2d6d6dc860f72c41cee636b' + 'c16109863bc63f3dad4ef35305a340bb' + '29a32617382fab1735acba4d920f1fcd' + 'e66466b9304dac85eb42b32f1ec3b284') diff --git a/testing/net-tools/net-tools.install b/testing/net-tools/net-tools.install new file mode 100644 index 000000000..9eee9e51b --- /dev/null +++ b/testing/net-tools/net-tools.install @@ -0,0 +1,12 @@ +post_upgrade() { + if [ "$(vercmp $2 1.60-16)" -lt 0 ]; then + echo "hostname and {,yp,nis}domainname has moved:" + echo "----------" + echo "hostname is now in coreutils" + echo "domainname is now in yp-tools" + echo "their functionality might have changed slightly" + echo "" + echo "dnsdomainname remains in net-tools" + echo "----------" + fi +} -- cgit v1.2.3-54-g00ecf From ad4b2565385561c6ff56f1f91c1e40115cf939d7 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 12 Jun 2011 22:59:55 +0000 Subject: Sun Jun 12 22:59:55 UTC 2011 --- community/calibre/PKGBUILD | 8 +- community/mldonkey/PKGBUILD | 16 ++- community/mldonkey/mldonkey-gcc46.patch | 12 ++ community/mldonkey/mldonkey.conf | 3 - community/mldonkey/mldonkeyd | 21 ++- community/open-vm-tools-modules/PKGBUILD | 12 +- community/open-vm-tools/PKGBUILD | 10 +- community/rawtherapee/PKGBUILD | 7 +- community/virtualbox/PKGBUILD | 8 +- .../virtualbox/virtualbox-guest-modules.install | 2 +- community/wine/PKGBUILD | 145 +++++++++++++++++++++ community/wine/wine.install | 12 ++ core/coreutils/PKGBUILD | 12 +- core/net-tools/PKGBUILD | 25 ++-- core/net-tools/net-tools.install | 12 ++ extra/enchant/PKGBUILD | 5 +- extra/ethtool/PKGBUILD | 6 +- extra/exo/PKGBUILD | 6 +- extra/hplip/PKGBUILD | 18 ++- extra/lirc/PKGBUILD | 23 +++- extra/lirc/kernel-2.6.39.patch | 54 ++++++++ extra/lirc/lirc.install | 2 +- extra/lirc/lirc_atiusb-kfifo.patch | 31 +++++ extra/lirc/lirc_wpc8769l.patch | 88 +++++++++++++ extra/lirc/lircd-handle-large-config.patch | 39 ++++++ extra/wireshark/PKGBUILD | 10 +- libre/icecat/PKGBUILD | 8 +- libre/initscripts/PKGBUILD | 4 +- multilib-testing/lib32-glibc/PKGBUILD | 12 +- .../lib32-glibc/glibc-2.14-revert-4462fad3.patch | 37 ++++++ testing/glibc/PKGBUILD | 15 ++- testing/glibc/glibc-2.14-revert-4462fad3.patch | 37 ++++++ testing/python2/PKGBUILD | 87 +++++++++++++ testing/python2/python-2.7-db51.patch | 42 ++++++ testing/subversion/PKGBUILD | 8 +- 35 files changed, 741 insertions(+), 96 deletions(-) create mode 100644 community/mldonkey/mldonkey-gcc46.patch create mode 100644 community/wine/PKGBUILD create mode 100644 community/wine/wine.install create mode 100644 core/net-tools/net-tools.install create mode 100644 extra/lirc/kernel-2.6.39.patch create mode 100644 extra/lirc/lirc_atiusb-kfifo.patch create mode 100644 extra/lirc/lirc_wpc8769l.patch create mode 100644 extra/lirc/lircd-handle-large-config.patch create mode 100644 multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch create mode 100644 testing/glibc/glibc-2.14-revert-4462fad3.patch create mode 100644 testing/python2/PKGBUILD create mode 100644 testing/python2/python-2.7-db51.patch (limited to 'libre/initscripts') diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 5ad10d94b..14ae58ba1 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 48634 2011-06-03 16:47:30Z stephane $ +# $Id: PKGBUILD 49119 2011-06-11 10:20:21Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Petrov Roman # Contributor: Andrea Fagiani pkgname=calibre -pkgver=0.8.3 -pkgrel=2 +pkgver=0.8.5 +pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') url="http://calibre-ebook.com/" @@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz desktop_integration.patch) -md5sums=('aee05cac444f68491f2a3d68b22da53e' +md5sums=('b6b07a35afe4dbf188f42e932536cca3' 'f4b80e3b34e34bce68b3f052ff52dee8') build() { diff --git a/community/mldonkey/PKGBUILD b/community/mldonkey/PKGBUILD index 5cd449c3f..c05548fba 100644 --- a/community/mldonkey/PKGBUILD +++ b/community/mldonkey/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 40262 2011-02-22 17:18:28Z cbrannon $ +# $Id: PKGBUILD 49135 2011-06-11 15:20:48Z cbrannon $ # Maintainer: Chris Brannon # Contributor: Corrado Primier # Contributor: Alessio 'mOLOk' Bolognino pkgname=mldonkey pkgver=3.0.7 -pkgrel=2 +pkgrel=3 pkgdesc="A multi-network P2P client" arch=('i686' 'x86_64') url="http://mldonkey.sourceforge.net/" @@ -17,11 +17,16 @@ optdepends=('librsvg: GUI support' backup=('etc/conf.d/mldonkey') install=mldonkey.install source=(http://downloads.sourceforge.net/sourceforge/mldonkey/$pkgname-$pkgver.tar.bz2 - mldonkeyd mldonkey.conf mldonkey.desktop) + mldonkey-gcc46.patch + mldonkeyd + mldonkey.conf + mldonkey.desktop) build() { cd "$srcdir/$pkgname-$pkgver" + # Patch comes from upstream; will go away in later versions. + patch -p1 < "$srcdir/mldonkey-gcc46.patch" ./configure --prefix=/usr --enable-gui=newgui2 make } @@ -39,6 +44,7 @@ package() { install -Dm644 "$srcdir/mldonkey.conf" "$pkgdir/etc/conf.d/mldonkey" } md5sums=('162b78fc4e20335a8fe31d91e1656db2' - 'c42526cb7ff703b313728dfdd92dfb1e' - '190cbbc30b510981e0d8b0ed8bae87a4' + 'c2bd99420ba5d48629b6823aae6bf127' + '75e4b6c7fb282f7de15a8d5478f3bd70' + '1f86d92db51c62cded0e6f3833057dee' '1de3266caa49f82bee73ba891eea12cf') diff --git a/community/mldonkey/mldonkey-gcc46.patch b/community/mldonkey/mldonkey-gcc46.patch new file mode 100644 index 000000000..656d72f85 --- /dev/null +++ b/community/mldonkey/mldonkey-gcc46.patch @@ -0,0 +1,12 @@ +diff --git a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h +index 775a898..af1621b 100644 +--- a/src/utils/lib/CryptoPP.h ++++ b/src/utils/lib/CryptoPP.h +@@ -695,6 +695,7 @@ class CRYPTOPP_DLL NullNameValuePairs : public NameValuePairs + { + public: + bool GetVoidValue(const char* /* name */, const std::type_info& /* valueType */, void* /* pValue */) const {return false;} ++ NullNameValuePairs() {} + }; + + //! _ diff --git a/community/mldonkey/mldonkey.conf b/community/mldonkey/mldonkey.conf index 7aa683f1a..24a25af74 100644 --- a/community/mldonkey/mldonkey.conf +++ b/community/mldonkey/mldonkey.conf @@ -3,6 +3,3 @@ MLDUSER="" # Parameters to be passed to the daemon (default is empty) PARAMS="" - -# PID file location (defaults to "/var/lock" if empty) -PIDDIR="" diff --git a/community/mldonkey/mldonkeyd b/community/mldonkey/mldonkeyd index bbd6954c2..6a458d68e 100644 --- a/community/mldonkey/mldonkeyd +++ b/community/mldonkey/mldonkeyd @@ -9,6 +9,15 @@ if [ -z $MLDUSER ] ; then exit 2 fi +if [ -z "$(getent passwd "$MLDUSER")" ]; then + # Perhaps we should create the account for the user? + echo "You must create the account $MLDUSER in order to run mldonkey." + echo "Please create the account manually, and try again." + exit 2 +fi + +MLDGROUPID=$(getent passwd "$MLDUSER" |cut -d':' -f4) +MLDGROUP=$(getent group $MLDGROUPID |cut -d':' -f1) USERDIR=$(getent passwd $MLDUSER | cut -d: -f6) if [ ! -d $USERDIR ]; then @@ -16,12 +25,20 @@ if [ ! -d $USERDIR ]; then exit 2 fi -PID=$(cat $USERDIR/.mldonkey/mlnet.pid 2>/dev/null) +PIDDIR="/var/run/mldonkey" +PIDFILE="$PIDDIR/mlnet.pid" +PID=$(cat $PIDFILE 2>/dev/null) case "$1" in start) stat_busy "Starting MLDonkey" - [ -z $PID ] && su $MLDUSER -s /bin/sh -c "/usr/bin/mlnet $PARAMS -log_to_syslog true &> /tmp/mldonkey.log &" + if [ ! -d $PIDDIR ]; then + install -d -m755 -o "$MLDUSER" -g "$MLDGROUP" $PIDDIR + fi + if [ "$(stat -c %U $PIDDIR)" != "$MLDUSER" ]; then + chown -R "$MLDUSER:$MLDGROUP" $PIDDIR + fi + [ -z $PID ] && su $MLDUSER -s /bin/sh -c "/usr/bin/mlnet -pid $PIDDIR $PARAMS -log_to_syslog true &> /tmp/mldonkey.log &" if [ $? -gt 0 ]; then stat_fail else diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD index 7c9125ade..127bf5c92 100644 --- a/community/open-vm-tools-modules/PKGBUILD +++ b/community/open-vm-tools-modules/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 44312 2011-04-05 15:06:23Z spupykin $ +# $Id: PKGBUILD 49143 2011-06-11 22:40:49Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Krzysztof Raczkowski pkgname=open-vm-tools-modules -pkgver=2011.03.28 -_pkgsubver=387002 +pkgver=2011.05.27 +_pkgsubver=420096 pkgrel=1 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools." arch=('i686' 'x86_64') @@ -13,13 +13,13 @@ license=('GPL') makedepends=('libdnet' 'icu' 'uriparser' 'kernel26-headers') depends=("kernel26") install=$pkgname.install -source=(http://easynews.dl.sourceforge.net/sourceforge/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz) -md5sums=('a9c72ab0b8f7778d444e69e9d3b95527') +source=(http://kent.dl.sourceforge.net/sourceforge/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz) +md5sums=('3e43d4857d412d02115e69db193830b5') build() { cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" sed -i 's#-lproc-3.2.7#-lproc-3.2.8#' configure - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr + [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --without-x (cd modules && make modules) } diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD index 9a97df2e4..447d3dedd 100644 --- a/community/open-vm-tools/PKGBUILD +++ b/community/open-vm-tools/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 48659 2011-06-03 19:34:11Z stephane $ +# $Id: PKGBUILD 49148 2011-06-11 22:48:15Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Krzysztof Raczkowski pkgname=open-vm-tools -pkgver=2011.03.28 -_pkgsubver=387002 -pkgrel=4 +pkgver=2011.05.27 +_pkgsubver=420096 +pkgrel=1 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools." arch=('i686' 'x86_64') url="http://open-vm-tools.sourceforge.net/" @@ -24,7 +24,7 @@ source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver} tools.conf vmware-guestd xautostart.conf) -md5sums=('a9c72ab0b8f7778d444e69e9d3b95527' +md5sums=('3e43d4857d412d02115e69db193830b5' '06f7448e274db2a911f582e276088fc9' 'b183ec265200d68431a5e4eb1b0c8cf5' '8c333a979578bdc0c3134c1dd6bb7353' diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD index 1de4c8f15..331f5b011 100644 --- a/community/rawtherapee/PKGBUILD +++ b/community/rawtherapee/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 48519 2011-06-01 11:08:54Z stativ $ +# $Id: PKGBUILD 49124 2011-06-11 10:51:22Z stativ $ # Maintainer: Lukas Jirkovsky # Contributor: Bogdan Szczurek # Contributor: Vaclav Kramar # Contributor: Archie pkgname=rawtherapee -pkgver=3.1m5 +pkgver=3.1m6 pkgrel=1 pkgdesc="RAW photo editor" arch=('i686' 'x86_64') url="http://www.rawtherapee.com/" license=('GPL') -depends=('bzip2' 'libsigc++' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils') +depends=('bzip2' 'gtkmm' 'libiptcdata' 'lcms2' 'desktop-file-utils') makedepends=('mercurial' 'cmake') install=rawtherapee.install source=(rawtherapee.desktop rawtherapee.png) @@ -47,7 +47,6 @@ build() { cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DWITH_MYFILE_MMAP=OFF \ ../$_repo make } diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index 99ccde3a0..ca6bff6ee 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 47286 2011-05-20 18:13:22Z ibiru $ +# $Id: PKGBUILD 49114 2011-06-11 08:28:49Z ibiru $ #Maintainer: Ionut Biru pkgbase=virtualbox pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') pkgver=4.0.8 -pkgrel=2 +pkgrel=4 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL' 'custom') @@ -17,7 +17,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver} 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh 18-system-xorg.patch change_default_driver_dir.patch) -_kernver=2.6.38-ARCH +_kernver=2.6.39-ARCH build() { cd "$srcdir/VirtualBox-${pkgver}_OSE" @@ -179,7 +179,7 @@ package_virtualbox-guest-modules(){ pkgdesc="VirtualBox kernel modules for Linux guests" license=('GPL') install=virtualbox-guest-modules.install - depends=('kernel26>=2.6.38' 'kernel26<2.6.39') + depends=('kernel26>=2.6.39' 'kernel26<2.6.40') replaces=('virtualbox-ose-additions-modules') conflicts=('virtualbox-ose-additions-modules') diff --git a/community/virtualbox/virtualbox-guest-modules.install b/community/virtualbox/virtualbox-guest-modules.install index 3681c28e3..ae05bd1ba 100644 --- a/community/virtualbox/virtualbox-guest-modules.install +++ b/community/virtualbox/virtualbox-guest-modules.install @@ -1,4 +1,4 @@ -KERNEL_VERSION='2.6.38-ARCH' +KERNEL_VERSION='2.6.39-ARCH' post_install() { cat << EOM diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD new file mode 100644 index 000000000..b71a1557d --- /dev/null +++ b/community/wine/PKGBUILD @@ -0,0 +1,145 @@ +# $Id: PKGBUILD 49102 2011-06-11 03:15:30Z svenstaro $ +# Maintainer: Sven-Hendrik Haase +# Contributor: Jan "heftig" Steffens +# Contributor: Eduardo Romero +# Contributor: Giovanni Scafora + +pkgname=wine +pkgver=1.3.22 +pkgrel=1 + +_pkgbasever=${pkgver/rc/-rc} + +source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2) +md5sums=('46f313013644d31ad37b8fc5c2c16467') + +pkgdesc="A compatibility layer for running Windows programs" +url="http://www.winehq.com" +arch=(i686 x86_64) +license=(LGPL) +install=wine.install + +depends=( + fontconfig lib32-fontconfig + mesa lib32-mesa + libxcursor lib32-libxcursor + libxrandr lib32-libxrandr + libxdamage lib32-libxdamage + libxxf86dga lib32-libxxf86dga + libxi lib32-libxi + alsa-lib lib32-alsa-lib + desktop-file-utils +) + +makedepends=(autoconf ncurses bison perl fontforge flex prelink + 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' + giflib lib32-giflib + libxpm lib32-libxpm + libpng lib32-libpng + libxinerama lib32-libxinerama + libxcomposite lib32-libxcomposite + libxmu lib32-libxmu + libxxf86vm lib32-libxxf86vm + libxml2 lib32-libxml2 + libxslt lib32-libxslt + libldap lib32-libldap + lcms lib32-lcms + mpg123 lib32-mpg123 + openal lib32-openal + jack lib32-jack + libcups lib32-libcups + gnutls lib32-gnutls + v4l-utils lib32-v4l-utils + oss +) + +optdepends=( + giflib lib32-giflib + libpng lib32-libpng + libldap lib32-libldap + lcms lib32-lcms + libxml2 lib32-libxml2 + mpg123 lib32-mpg123 + openal lib32-openal + jack lib32-jack + libcups lib32-libcups + gnutls lib32-gnutls + v4l-utils lib32-v4l-utils + oss +) + +if [[ $CARCH == i686 ]]; then + # Strip lib32 etc. on i686 + depends=(${depends[@]/*32-*/}) + makedepends=(${makedepends[@]/*32-*/}) + makedepends=(${makedepends[@]/*-multilib*/}) + optdepends=(${optdepends[@]/*32-*/}) +else + provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver") + conflicts=('bin32-wine' 'wine-wow64') + replaces=('bin32-wine') +fi + +build() { + cd "$srcdir" + + # Allow ccache to work + mv $pkgname-$_pkgbasever $pkgname + + # Get rid of old build dirs + rm -rf $pkgname-{32,64}-build + mkdir $pkgname-32-build + + if [[ $CARCH == x86_64 ]]; then + msg2 "Building Wine-64..." + + mkdir $pkgname-64-build + cd "$srcdir/$pkgname-64-build" + ../$pkgname/configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib \ + --with-x \ + --enable-win64 + + make + + _wine32opts=( + --libdir=/usr/lib32 + --with-wine64="$srcdir/$pkgname-64-build" + ) + + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + fi + + msg2 "Building Wine-32..." + cd "$srcdir/$pkgname-32-build" + ../$pkgname/configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-x \ + "${_wine32opts[@]}" + + make +} + +package() { + msg2 "Packaging Wine-32..." + cd "$srcdir/$pkgname-32-build" + + if [[ $CARCH == i686 ]]; then + make prefix="$pkgdir/usr" install + else + make prefix="$pkgdir/usr" \ + libdir="$pkgdir/usr/lib32" \ + dlldir="$pkgdir/usr/lib32/wine" install + + msg2 "Packaging Wine-64..." + cd "$srcdir/$pkgname-64-build" + make prefix="$pkgdir/usr" \ + libdir="$pkgdir/usr/lib" \ + dlldir="$pkgdir/usr/lib/wine" install + fi +} + +# vim:set ts=8 sts=2 sw=2 et: diff --git a/community/wine/wine.install b/community/wine/wine.install new file mode 100644 index 000000000..f71262186 --- /dev/null +++ b/community/wine/wine.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." + echo "If you are on x86_64, the default WINEARCH will be win64." + echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." + echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." + echo "See the Arch wiki on wine for more information." +} + +post_remove() { + update-desktop-database -q +} diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index 8fdbe0149..6d75f0659 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126199 2011-06-02 14:37:57Z bisson $ +# $Id: PKGBUILD 127042 2011-06-10 00:56:53Z bisson $ # Maintainer: Allan McRae # Contributor: judd pkgname=coreutils pkgver=8.12 -pkgrel=2 +pkgrel=3 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64') license=('GPL3') @@ -35,8 +35,8 @@ build() { autoreconf -v ./configure --prefix=/usr \ - --enable-install-program=su,hostname \ - --enable-no-install-program=groups,kill,uptime \ + --enable-install-program=su \ + --enable-no-install-program=groups,hostname,kill,uptime \ --enable-pam make } @@ -54,8 +54,8 @@ package() { install -dm755 ${pkgdir}/{bin,usr/sbin} # binaries required by FHS - _fhs="cat chgrp chmod chown cp date dd df echo false hostname \ - ln ls mkdir mknod mv pwd rm rmdir stty su sync true uname" + _fhs="cat chgrp chmod chown cp date dd df echo false ln ls \ + mkdir mknod mv pwd rm rmdir stty su sync true uname" mv ${_fhs} ${pkgdir}/bin # binaries required by various Arch scripts diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD index d9b2380bc..6a81124ea 100644 --- a/core/net-tools/PKGBUILD +++ b/core/net-tools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 126212 2011-06-02 16:50:35Z bisson $ +# $Id: PKGBUILD 127037 2011-06-10 00:48:19Z bisson $ # Maintainer: judd pkgname=net-tools pkgver=1.60 -pkgrel=16 +pkgrel=18 pkgdesc="Configuration tools for Linux networking" arch=(i686 x86_64) license=('GPL') @@ -14,13 +14,7 @@ source=(http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2 net-tools-1.60-nameif.patch net-tools-1.60-nameif_strncpy.patch) options=(!makeflags) -md5sums=('888774accab40217dde927e21979c165' - '7ef8d0c6818faa0fdeea94970a20e3fb' - 'b52d899cba9956bb0055150506f41ac1' - '51de6eabe2d6d6dc860f72c41cee636b' - 'c16109863bc63f3dad4ef35305a340bb' - '29a32617382fab1735acba4d920f1fcd' - 'e66466b9304dac85eb42b32f1ec3b284') +install=net-tools.install build() { cd $srcdir/$pkgname-$pkgver @@ -37,7 +31,14 @@ package() { cd $srcdir/$pkgname-$pkgver make BASEDIR=$pkgdir update - # the following is provided by yp-tools and coreutils - rm "${pkgdir}"/bin/{{,dns,nis,yp}domainname,hostname} - rm "${pkgdir}"/usr/share/man/man1/{{,dns,nis,yp}domainname,hostname}.1 + # the following is provided by yp-tools + rm "${pkgdir}"/bin/{nis,yp}domainname + rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1 } +md5sums=('888774accab40217dde927e21979c165' + '7ef8d0c6818faa0fdeea94970a20e3fb' + 'b52d899cba9956bb0055150506f41ac1' + '51de6eabe2d6d6dc860f72c41cee636b' + 'c16109863bc63f3dad4ef35305a340bb' + '29a32617382fab1735acba4d920f1fcd' + 'e66466b9304dac85eb42b32f1ec3b284') diff --git a/core/net-tools/net-tools.install b/core/net-tools/net-tools.install new file mode 100644 index 000000000..9eee9e51b --- /dev/null +++ b/core/net-tools/net-tools.install @@ -0,0 +1,12 @@ +post_upgrade() { + if [ "$(vercmp $2 1.60-16)" -lt 0 ]; then + echo "hostname and {,yp,nis}domainname has moved:" + echo "----------" + echo "hostname is now in coreutils" + echo "domainname is now in yp-tools" + echo "their functionality might have changed slightly" + echo "" + echo "dnsdomainname remains in net-tools" + echo "----------" + fi +} diff --git a/extra/enchant/PKGBUILD b/extra/enchant/PKGBUILD index 1f95981e7..2edd15320 100644 --- a/extra/enchant/PKGBUILD +++ b/extra/enchant/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 126152 2011-06-01 20:31:07Z andyrtr $ +# $Id: PKGBUILD 127251 2011-06-11 20:47:42Z andrea $ # Maintainer: Andrea Scarpino # Contributor: dorphell pkgname=enchant pkgver=1.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="A wrapper library for generic spell checking" arch=('i686' 'x86_64') url="http://www.abisource.com/enchant/" license=('LGPL') depends=('aspell' 'dbus-glib' 'hunspell') makedepends=('hspell') +optdepends=('hspell: Hebrew dictionary') options=('!libtool') source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") md5sums=('de11011aff801dc61042828041fb59c7') diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD index 3186db961..02c404210 100644 --- a/extra/ethtool/PKGBUILD +++ b/extra/ethtool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 120232 2011-04-21 15:58:14Z ibiru $ +# $Id: PKGBUILD 127195 2011-06-11 08:04:12Z ibiru $ # Maintainer: Paul Mattal # Contributer: Martin Kemp pkgname=ethtool -pkgver=2.6.38 +pkgver=2.6.39 pkgrel=1 epoch=1 pkgdesc="gkernel ethtool" @@ -11,7 +11,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.bz2) -md5sums=('4cc35c59e4fd0defff768f9f59fa41ad') +md5sums=('97211a1e3a496bc3bd0b75849d0fbae9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD index 046dca618..daf711480 100644 --- a/extra/exo/PKGBUILD +++ b/extra/exo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123595 2011-05-11 17:34:16Z andyrtr $ +# $Id: PKGBUILD 127211 2011-06-11 09:02:27Z andyrtr $ # Maintainer: AndyRTR # Contributor: tobias # Contributor: Aurelien Foret pkgname=exo -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="Extensions to Xfce by os-cillation" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('perl-uri: for mail-compose helper script') options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/xfce/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2ae3d9a9dedc3adebb748fa8724e02ce') +md5sums=('e25333df350abc30999cd16fe96ab690') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/hplip/PKGBUILD b/extra/hplip/PKGBUILD index 21b65a2b2..22b0043ac 100644 --- a/extra/hplip/PKGBUILD +++ b/extra/hplip/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 116953 2011-03-26 16:48:46Z tpowa $ -# Maintainer : Tobias Powalowski +# $Id: PKGBUILD 127207 2011-06-11 09:02:04Z remy $ +# Maintainer : Rémy Oudompheng # Contributor: Morgan LEFIEUX pkgname=hplip -pkgver=3.11.3 +pkgver=3.11.5 pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" arch=('i686' 'x86_64') @@ -19,14 +19,17 @@ optdepends=('cups: for printing support' 'python-notify: for Desktop notification support' 'rpcbind: for network support' 'python2-qt: for running hp-toolbox' - 'pygobject: for running hp-toolbox') + 'pygobject: for running hp-toolbox' + 'hplip-plugin: binary blobs for specific devices') replaces=('hpijs') options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz) +md5sums=('0a3d0f46ec89857b4c0feea6923864f1') build() { cd "$srcdir/$pkgname-$pkgver" + export PYTHON=python2 find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + ./configure --prefix=/usr \ --enable-qt4 \ @@ -56,6 +59,9 @@ package() { # remove lp user, it's not used on archlinux sed -i 's|OWNER="lp", ||g' "$pkgdir/lib/udev/rules.d/40-hplip.rules" # fix sysfs rules - sed -i -e "s|SYSFS|ATTRS|g" -e "s|sysfs|attrs|g" "$pkgdir/lib/udev/rules.d/56-hpmud_support.rules" + sed -i -e "s|SYSFS|ATTR|g" \ + -e "s|sysfs|attr|g" \ + -e 's|"bin/sh|"/bin/sh|g' \ + "$pkgdir/lib/udev/rules.d/56-hpmud_support.rules" } -md5sums=('9a2f39cb02214ee0def550defac0d240') + diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD index 1008b2723..201e916fa 100644 --- a/extra/lirc/PKGBUILD +++ b/extra/lirc/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 118049 2011-04-05 07:45:38Z jgc $ +# $Id: PKGBUILD 127217 2011-06-11 09:10:14Z ibiru $ # Maintainer: Paul Mattal pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 -pkgrel=2 +pkgrel=4 epoch=1 -_kernver=2.6.38-ARCH +_kernver=2.6.39-ARCH arch=('i686' 'x86_64') url="http://www.lirc.org/" license=('GPL') -makedepends=('help2man' 'kernel26-headers>=2.6.38' 'kernel26-headers<2.6.39' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python') +makedepends=('help2man' 'kernel26-headers>=2.6.39' 'kernel26-headers<2.6.40' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2 + lirc_wpc8769l.patch + lircd-handle-large-config.patch + lirc_atiusb-kfifo.patch + kernel-2.6.39.patch lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd) md5sums=('b232aef26f23fe33ea8305d276637086' + '1cce37e18e3f6f46044abab29016d18f' + 'b70cc9640505205446ec47b7d4779f38' + '1f8b104a2365d9f93404b143f499059b' + '087a7d102e1c96bf1179f38db2b0b237' '8d0e238dc0eda95e340fe570605da492' '85f7fdac55e5256967241864049bf5e9' '3deb02604b37811d41816e9b4385fcc3' @@ -24,6 +32,10 @@ md5sums=('b232aef26f23fe33ea8305d276637086' build() { cd "${srcdir}/lirc-${pkgver}" + patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch" + patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch" + patch -Np1 -i "${srcdir}/lirc_atiusb-kfifo.patch" + patch -Np1 -i "${srcdir}/kernel-2.6.39.patch" sed -i '/AC_PATH_XTRA/d' configure.ac sed -e 's/@X_CFLAGS@//g' \ @@ -48,7 +60,7 @@ build() { package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" - depends=('lirc-utils' 'kernel26>=2.6.38' 'kernel26<2.6.39') + depends=('lirc-utils' 'kernel26>=2.6.39' 'kernel26<2.6.40') replaces=('lirc+pctv') install=lirc.install @@ -66,6 +78,7 @@ package_lirc-utils() { depends=('alsa-lib' 'libx11' 'libftdi' 'libirman') optdepends=('python2: pronto2lirc utility') options=('strip' '!libtool') + backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf') cd "${srcdir}/lirc-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/lirc/kernel-2.6.39.patch b/extra/lirc/kernel-2.6.39.patch new file mode 100644 index 000000000..7353d61ca --- /dev/null +++ b/extra/lirc/kernel-2.6.39.patch @@ -0,0 +1,54 @@ +diff -ru lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c +--- lirc-0.9.0/drivers//lirc_atiusb/lirc_atiusb.c 2011-03-25 23:28:18.000000000 +0100 ++++ lirc-0.9.0.new/drivers//lirc_atiusb/lirc_atiusb.c 2011-06-07 17:02:20.356580306 +0200 +@@ -48,7 +48,6 @@ + #include + #include + #include +-#include + #include + #include + #include +diff -ru lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c +--- lirc-0.9.0/drivers//lirc_i2c/lirc_i2c.c 2011-03-25 23:28:18.000000000 +0100 ++++ lirc-0.9.0.new/drivers//lirc_i2c/lirc_i2c.c 2011-06-07 17:04:19.725933627 +0200 +@@ -555,8 +555,8 @@ + kfree(ir); + return -EINVAL; + } +- printk(KERN_INFO "lirc_i2c: chip 0x%x found @ 0x%02x (%s)\n", +- adap->id, addr, ir->c.name); ++ printk(KERN_INFO "lirc_i2c: chip found @ 0x%02x (%s)\n", ++ addr, ir->c.name); + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31) + /* register device */ +diff -ru lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c +--- lirc-0.9.0/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-03-25 23:28:18.000000000 +0100 ++++ lirc-0.9.0.new/drivers//lirc_wpc8769l/lirc_wpc8769l.c 2011-06-07 17:07:23.984935411 +0200 +@@ -361,14 +361,14 @@ + size = count << 3; + + ldata = (unsigned long *) data_buf; +- next_one = generic_find_next_le_bit(ldata, size, 0); ++ next_one = find_next_zero_bit_le(ldata, size, 0); + + if (next_one > 0) + put_pulse_bit(next_one + * WPC8769L_USECS_PER_BIT); + + while (next_one < size) { +- next_zero = generic_find_next_zero_le_bit(ldata, ++ next_zero = find_next_zero_bit_le(ldata, + size, next_one + 1); + + put_space_bit( +@@ -376,7 +376,7 @@ + * WPC8769L_USECS_PER_BIT); + + if (next_zero < size) { +- next_one = generic_find_next_le_bit(ldata, ++ next_one = find_next_bit_le(ldata, + size, next_zero + 1); + + put_pulse_bit( diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install index 61151ecf5..26fb1391e 100644 --- a/extra/lirc/lirc.install +++ b/extra/lirc/lirc.install @@ -1,4 +1,4 @@ -KERNEL_VERSION=2.6.38-ARCH +KERNEL_VERSION=2.6.39-ARCH post_install() { # updating module dependencies diff --git a/extra/lirc/lirc_atiusb-kfifo.patch b/extra/lirc/lirc_atiusb-kfifo.patch new file mode 100644 index 000000000..a64984dce --- /dev/null +++ b/extra/lirc/lirc_atiusb-kfifo.patch @@ -0,0 +1,31 @@ +From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001 +From: Jason Martin +Date: Fri, 3 Jun 2011 00:12:51 -0400 +Subject: [PATCH] lirc_atiusb: fix buffer alloc to work with new kfifo + +I came across posts with regards to lirc_atiusb and its compatibility +with newer kernels, and their use of kfifo.I spent a little bit of time +this evening, and was able to correct the issues with the driver, and +now have a functioning lirc_atiusb device under the 2.6.38 kernel. + +Signed-off-by: Jarod Wilson +--- + drivers/lirc_atiusb/lirc_atiusb.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c +index 52080de..bf2b631 100644 +--- a/drivers/lirc_atiusb/lirc_atiusb.c ++++ b/drivers/lirc_atiusb/lirc_atiusb.c +@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf) + goto new_irctl_failure_check; + } + +- if (lirc_buffer_init(driver->rbuf, dclen, 1)) { ++ if (lirc_buffer_init(driver->rbuf, dclen, 2)) { + mem_failure = 4; + goto new_irctl_failure_check; + } +-- +1.7.0.1 + diff --git a/extra/lirc/lirc_wpc8769l.patch b/extra/lirc/lirc_wpc8769l.patch new file mode 100644 index 000000000..e4e2a049b --- /dev/null +++ b/extra/lirc/lirc_wpc8769l.patch @@ -0,0 +1,88 @@ +From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001 +From: =?utf8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?= +Date: Wed, 30 Mar 2011 16:46:35 -0400 +Subject: [PATCH] Make lirc_wpc8769l functional again + +Signed-off-by: Jarod Wilson +--- + drivers/lirc_wpc8769l/lirc_wpc8769l.c | 28 +++++++++++++++++----------- + 1 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c +index f820d11..4d04063 100644 +--- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c ++++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c +@@ -816,10 +816,6 @@ static int set_use_inc(void *data) + /* Reset last timeout value. */ + lastus = 0; + +- /* Init the read buffer. */ +- if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) +- return -ENOMEM; +- + /* Acquire the IRQ. */ + result = request_irq(irq, irq_handler, + IRQF_DISABLED | IRQF_SHARED, +@@ -863,9 +859,6 @@ static void set_use_dec(void *data) + /* Free the IRQ. */ + free_irq(irq, THIS_MODULE); + dprintk("Freed IRQ %d\n", irq); +- +- /* Free the RX buffer. */ +- lirc_buffer_free(&rbuf); + } + + static struct lirc_driver driver = { +@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void) + /* Do load-time checks. */ + wpc8769l_power_up_and_check_if_we_woke_us_up(); + ++ /* Init the read buffer. */ ++ if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) { ++ rc = -ENOMEM; ++ goto exit_platform_exit; ++ } ++ + /* Configure the driver hooks. */ + driver.features = LIRC_CAN_REC_MODE2; ++ driver.dev = &lirc_wpc8769l_platform_dev->dev; + driver.minor = lirc_register_driver(&driver); + if (driver.minor < 0) { + eprintk("lirc_register_driver failed!\n"); + rc = -EIO; +- goto exit_platform_exit; ++ goto exit_release_buffer; + } + + iprintk("Driver loaded.\n"); + + return 0; /* Everything OK. */ + ++exit_release_buffer: ++ lirc_buffer_free(&rbuf); ++ + exit_platform_exit: + lirc_wpc8769l_platform_exit(); + +@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init); + + static void __exit lirc_wpc8769l_module_exit(void) + { +- /* Unregister the platform driver and device. */ +- lirc_wpc8769l_platform_exit(); +- + /* Unregister the LIRC driver. */ + lirc_unregister_driver(driver.minor); + ++ /* Free the buffer. */ ++ lirc_buffer_free(&rbuf); ++ ++ /* Unregister the platform driver and device. */ ++ lirc_wpc8769l_platform_exit(); ++ + /* Release the second range. */ + if (baseport2) + release_region(baseport2, WPC8769L_IO_REGION_2_SIZE); +-- +1.7.0.1 + diff --git a/extra/lirc/lircd-handle-large-config.patch b/extra/lirc/lircd-handle-large-config.patch new file mode 100644 index 000000000..85bc20518 --- /dev/null +++ b/extra/lirc/lircd-handle-large-config.patch @@ -0,0 +1,39 @@ +From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001 +From: Jarod Wilson +Date: Wed, 6 Apr 2011 11:04:12 -0400 +Subject: [PATCH] lircd: handle larger config files in write_socket better + +Pointed out by Michael Zanetti on list, irsend LIST has issues with long +config files, which didn't exist in maintainer mode, as we were using a +do while loop to make sure we spit out everything. Just use that loop +all the time. + +Signed-off-by: Jarod Wilson +--- + daemons/lircd.c | 8 ++------ + 1 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/daemons/lircd.c b/daemons/lircd.c +index 6c21a3a..ddcca05 100644 +--- a/daemons/lircd.c ++++ b/daemons/lircd.c +@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len) + int done, todo = len; + + while (todo) { +-#ifdef SIM_REC + do { + done = write(fd, buf, todo); +- } +- while (done < 0 && errno == EAGAIN); +-#else +- done = write(fd, buf, todo); +-#endif ++ } while (done < 0 && errno == EAGAIN); ++ + if (done <= 0) + return (done); + buf += done; +-- +1.7.0.1 + diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index a617eb19e..eac2509d0 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 126496 2011-06-05 16:47:00Z guillaume $ +# $Id: PKGBUILD 127256 2011-06-11 21:34:35Z guillaume $ # Maintainer: Guillaume ALAUX # Contributor: Florian Pritz pkgname=(wireshark-cli wireshark-gtk) pkgbase=wireshark -pkgver=1.4.7 -pkgrel=2 +pkgver=1.6.0 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') makedepends=('bison' 'flex' 'gtk2' 'krb5' 'libpcap' 'bash' 'gnutls' 'libcap' 'lua') url="http://www.wireshark.org/" options=(!libtool) source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2) -md5sums=('b5065426d5524ddc1667314f8256c2b1') +md5sums=('9f9314c89bf1c8b440a7909884838cfd') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -20,7 +20,7 @@ build() { ./configure \ --prefix=/usr \ --with-ssl \ - --with-zlib=no \ + --with-zlib=yes \ --with-lua make all } diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index b2af0eaf1..89f6755fb 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Figue # Contributor: Figue # Contributor (Parabola): fauno -# Contrubutor (Parabola): vando +# Contributor (Parabola): vando # Thank you very much to the older contributors: # Contributor: evr # Contributor: Muhammad 'MJ' Jassim @@ -20,7 +20,7 @@ pkgname=icecat pkgver=4.0.1 -pkgrel=1 +pkgrel=2 _xulver=2.0.1 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!" arch=('i686' 'x86_64' 'mips64el') @@ -28,9 +28,9 @@ url="http://www.gnu.org/software/gnuzilla/" license=('GPL2' 'MPL' 'LGPL') depends=("xulrunner=${_xulver}" 'desktop-file-utils') makedepends=('zip' 'pkg-config' 'diffutils' 'python2' 'wireless_tools' 'yasm' 'mesa') -provides=('firefox') +provides=("firefox=${pkgver}") conflicts=('firefox') -replaces=("firefox=${pkgver}") +replaces=('firefox') install=icecat.install source=(http://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz mozconfig diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD index bb255b4aa..a6a3abecb 100644 --- a/libre/initscripts/PKGBUILD +++ b/libre/initscripts/PKGBUILD @@ -6,7 +6,7 @@ pkgname=initscripts pkgver=2011.06.4 -pkgrel=1.1 +pkgrel=2 pkgdesc="System initialization/bootup scripts (Parabola branding)" arch=('i686' 'x86_64') url="http://parabolagnulinux.org" @@ -22,7 +22,7 @@ optdepends=('bridge-utils: Network bridging support' install=initscripts.install source=("https://projects.parabolagnulinux.org/initscripts.git/snapshot/initscripts-${pkgver}.tar.bz2" 'wireless.conf.d') -md5sums=('de758f8da0552555135f53bd7184966a' +md5sums=('df73e4c4043d4eaf6502ca6738c549aa' '027576534885b8d5dded9be546057b12') package() { diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD index f5958c7da..e1ed19461 100644 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ b/multilib-testing/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48898 2011-06-07 12:25:15Z heftig $ +# $Id: PKGBUILD 49129 2011-06-11 13:29:12Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Jan de Groot # Contributor: Allan McRae @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.14 -pkgrel=1 +pkgrel=2 _glibcdate=20110605 pkgdesc="GNU C Library for multilib" arch=('x86_64') @@ -26,6 +26,7 @@ source=(http://mirrors.kernel.org/archlinux/other/glibc/${_pkgbasename}-${pkgver glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.13-futex.patch glibc-2.14-libdl-crash.patch + glibc-2.14-revert-4462fad3.patch lib32-glibc.conf) md5sums=('a96742599fc8a99e52b9e344f39a1000' '4dadb9203b69a3210d53514bb46f41c3' @@ -35,6 +36,7 @@ md5sums=('a96742599fc8a99e52b9e344f39a1000' 'b042647ea7d6f22ad319e12e796bd13e' '7d0154b7e17ea218c9fa953599d24cc4' 'cea62cc6b903d222c5f26e05a3c0e0e6' + '46e56492cccb1c9172ed3a235cf43c6c' '6e052f1cb693d5d3203f50f9d4e8c33b') build() { @@ -65,6 +67,10 @@ build() { # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch + # revert fix for http://sourceware.org/bugzilla/show_bug.cgi?id=12684 + # as it causes crashes (FS#24615) + patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch + cd ${srcdir} mkdir glibc-build cd glibc-build @@ -119,7 +125,7 @@ package() { usr/lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \ - usr/lib32/{pt_chown,gconv/*.so} + usr/lib32/{pt_chown,{audit,gconv}/*.so} # Dynamic linker install -d -m755 ${pkgdir}/lib diff --git a/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch b/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch new file mode 100644 index 000000000..d71e37492 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch @@ -0,0 +1,37 @@ +diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c +--- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 ++++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 +@@ -549,7 +549,7 @@ + ns, ansp, ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || resplen2 == 0)) ++ if (n == 0) + goto next_ns; + } else { + /* Use datagrams. */ +@@ -559,7 +559,7 @@ + ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || resplen2 == 0)) ++ if (n == 0) + goto next_ns; + if (v_circuit) + // XXX Check whether both requests failed or +@@ -1275,14 +1275,10 @@ + (*thisresplenp > *thisanssizp) + ? *thisanssizp : *thisresplenp); + +- if (recvresp1 || (buf2 != NULL && recvresp2)) { +- *resplen2 = 0; ++ if (recvresp1 || (buf2 != NULL && recvresp2)) + return resplen; +- } + if (buf2 != NULL) + { +- /* No data from the first reply. */ +- resplen = 0; + /* We are waiting for a possible second reply. */ + if (hp->id == anhp->id) + recvresp1 = 1; diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD index 51a4b2ae0..3c31ac43a 100644 --- a/testing/glibc/PKGBUILD +++ b/testing/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 126794 2011-06-07 10:57:24Z allan $ +# $Id: PKGBUILD 127202 2011-06-11 08:46:22Z allan $ # Maintainer: Allan McRae # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.14 -pkgrel=1 +pkgrel=2 _glibcdate=20110605 pkgdesc="GNU C Library" arch=('i686' 'x86_64') @@ -27,6 +27,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.13-futex.patch glibc-2.14-libdl-crash.patch + glibc-2.14-revert-4462fad3.patch nscd locale.gen.txt locale-gen) @@ -38,6 +39,7 @@ md5sums=('a96742599fc8a99e52b9e344f39a1000' 'b042647ea7d6f22ad319e12e796bd13e' '7d0154b7e17ea218c9fa953599d24cc4' 'cea62cc6b903d222c5f26e05a3c0e0e6' + '46e56492cccb1c9172ed3a235cf43c6c' 'b587ee3a70c9b3713099295609afde49' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') @@ -79,6 +81,10 @@ build() { # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch + # revert fix for http://sourceware.org/bugzilla/show_bug.cgi?id=12684 + # as it causes crashes (FS#24615) + patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch + install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf @@ -165,8 +171,5 @@ package() { lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ lib/{libmemusage,libpcprofile,libSegFault}.so \ - usr/lib/{pt_chown,gconv/*.so} - -# add usr/lib/audit/sotruss-lib.so, usr/bin/sotruss - + usr/lib/{pt_chown,{audit,gconv}/*.so} } diff --git a/testing/glibc/glibc-2.14-revert-4462fad3.patch b/testing/glibc/glibc-2.14-revert-4462fad3.patch new file mode 100644 index 000000000..d71e37492 --- /dev/null +++ b/testing/glibc/glibc-2.14-revert-4462fad3.patch @@ -0,0 +1,37 @@ +diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c +--- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 ++++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 +@@ -549,7 +549,7 @@ + ns, ansp, ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || resplen2 == 0)) ++ if (n == 0) + goto next_ns; + } else { + /* Use datagrams. */ +@@ -559,7 +559,7 @@ + ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || resplen2 == 0)) ++ if (n == 0) + goto next_ns; + if (v_circuit) + // XXX Check whether both requests failed or +@@ -1275,14 +1275,10 @@ + (*thisresplenp > *thisanssizp) + ? *thisanssizp : *thisresplenp); + +- if (recvresp1 || (buf2 != NULL && recvresp2)) { +- *resplen2 = 0; ++ if (recvresp1 || (buf2 != NULL && recvresp2)) + return resplen; +- } + if (buf2 != NULL) + { +- /* No data from the first reply. */ +- resplen = 0; + /* We are waiting for a possible second reply. */ + if (hp->id == anhp->id) + recvresp1 = 1; diff --git a/testing/python2/PKGBUILD b/testing/python2/PKGBUILD new file mode 100644 index 000000000..f1c56f85d --- /dev/null +++ b/testing/python2/PKGBUILD @@ -0,0 +1,87 @@ +# $Id: PKGBUILD 127261 2011-06-12 03:23:25Z stephane $ +# Maintainer: Stéphane Gaudreault +# Contributer: Allan McRae +# Contributer: Jason Chu + +pkgname=python2 +pkgver=2.7.2 +pkgrel=1 +_pybasever=2.7 +pkgdesc="A high-level scripting language" +arch=('i686' 'x86_64') +license=('PSF') +url="http://www.python.org/" +depends=('db' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi') +makedepends=('tk') +optdepends=('tk: for IDLE') +conflicts=('python<3') +options=('!makeflags') +source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz + python-2.7-db51.patch) +sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53' + '9667a2a2f8594902b352793e649f78696a77bd13') + +build() { + cd "${srcdir}/Python-${pkgver}" + + patch -Np1 -i ../python-2.7-db51.patch + + # Temporary workaround for FS#22322 + # See http://bugs.python.org/issue10835 for upstream report + sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c + + # Enable built-in SQLite3 module to load extensions (fix FS#22122) + sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py + + # FS#2399 + sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py + + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), + # rather than copies shipped in the tarball + rm -r Modules/expat + rm -r Modules/zlib + rm -r Modules/_ctypes/{darwin,libffi}* + + export OPT="${CFLAGS}" + ./configure --prefix=/usr --enable-shared --with-threads --enable-ipv6 \ + --enable-unicode=ucs4 --with-system-expat --with-system-ffi + + make +} + +package() { + cd "${srcdir}/Python-${pkgver}" + make DESTDIR="${pkgdir}" altinstall maninstall + + ln -sf python${_pybasever} "${pkgdir}/usr/bin/python2" + ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config" + ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python2.1" + + ln -sf ../../libpython${_pybasever}.so \ + "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so" + + mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/" + + # some useful "stuff" + install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts} + install -m755 Tools/i18n/{msgfmt,pygettext}.py \ + "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/" + install -m755 Tools/scripts/{README,*py} \ + "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/" + + # fix conflicts with python + mv "${pkgdir}"/usr/bin/idle{,2} + mv "${pkgdir}"/usr/bin/pydoc{,2} + mv "${pkgdir}"/usr/bin/2to3{,-2.7} + + # clean up #!s + find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \ + xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" + + # clean-up reference to build directory + sed -i "s#${srcdir}/Python-${pkgver}:##" \ + "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile" + + # license + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/python2/python-2.7-db51.patch b/testing/python2/python-2.7-db51.patch new file mode 100644 index 000000000..2da95c375 --- /dev/null +++ b/testing/python2/python-2.7-db51.patch @@ -0,0 +1,42 @@ +diff -Naur Python-2.7-orig//Modules/_bsddb.c Python-2.7/Modules/_bsddb.c +--- Python-2.7-orig//Modules/_bsddb.c 2010-05-10 00:46:46.000000000 +1000 ++++ Python-2.7/Modules/_bsddb.c 2010-10-20 13:19:26.436669911 +1000 +@@ -9765,8 +9765,11 @@ + + ADD_INT(d, DB_REP_PERMANENT); + +-#if (DBVER >= 44) ++#if (DBVER >= 44) && (DBVER <= 48) + ADD_INT(d, DB_REP_CONF_NOAUTOINIT); ++#endif ++ ++#if (DBVER >= 44) + ADD_INT(d, DB_REP_CONF_DELAYCLIENT); + ADD_INT(d, DB_REP_CONF_BULK); + ADD_INT(d, DB_REP_CONF_NOWAIT); +diff -Naur Python-2.7-orig//setup.py Python-2.7/setup.py +--- Python-2.7-orig//setup.py 2010-06-27 22:36:16.000000000 +1000 ++++ Python-2.7/setup.py 2010-10-20 13:10:48.256670026 +1000 +@@ -765,7 +765,7 @@ + # a release. Most open source OSes come with one or more + # versions of BerkeleyDB already installed. + +- max_db_ver = (4, 8) ++ max_db_ver = (5, 1) + min_db_ver = (4, 1) + db_setup_debug = False # verbose debug prints from this script? + +@@ -787,8 +787,12 @@ + return True + + def gen_db_minor_ver_nums(major): +- if major == 4: ++ if major == 5: + for x in range(max_db_ver[1]+1): ++ if allow_db_ver((5, x)): ++ yield x ++ if major == 4: ++ for x in range(9): + if allow_db_ver((4, x)): + yield x + elif major == 3: diff --git a/testing/subversion/PKGBUILD b/testing/subversion/PKGBUILD index 40784dcb7..19cb12294 100644 --- a/testing/subversion/PKGBUILD +++ b/testing/subversion/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 126240 2011-06-02 20:16:49Z stephane $ +# $Id: PKGBUILD 127222 2011-06-11 09:32:25Z andrea $ # Maintainer: Paul Mattal # Contributor: Jason Chu pkgname=subversion pkgver=1.6.17 -pkgrel=3 +pkgrel=4 pkgdesc="Replacement for CVS, another versioning system (SVN)" arch=('i686' 'x86_64') license=('apache' 'bsd') -depends=('neon' 'apr-util') +depends=('neon' 'apr-util' 'sqlite3') makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'ruby' 'java-runtime' - 'autoconf' 'sqlite3' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') + 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs') source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2 svnserve svn svnserve.conf svnmerge.py subversion.rpath.fix.patch -- cgit v1.2.3-54-g00ecf