diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-15 10:55:52 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-03-15 10:55:52 +0100 |
| commit | 1f8bbc40bc42f162b7b62e0dca5176ba3d0b39a4 (patch) | |
| tree | b19a7be5f8a23cdf854c9694f968a531244204d2 | |
| parent | 2e3ca4b49391dc8484dd6064828ee42cbe66ed03 (diff) | |
| parent | eebfa6ebe1522831767019e496b0c094b2e15a5c (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/audex/PKGBUILD
community/gimp-ufraw/PKGBUILD
community/ogmrip/PKGBUILD
community/oss/PKGBUILD
community/ruby-gtk2/PKGBUILD
community/soundkonverter/PKGBUILD
core/iptables/PKGBUILD
core/libffi/PKGBUILD
extra/clamav/PKGBUILD
extra/ecasound/PKGBUILD
extra/mariadb/PKGBUILD
extra/mesa/PKGBUILD
52 files changed, 497 insertions, 1380 deletions
diff --git a/community/audex/PKGBUILD b/community/audex/PKGBUILD deleted file mode 100644 index 8bf86960c..000000000 --- a/community/audex/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 83864 2013-02-05 20:31:35Z lcarlier $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: mightyjaym <jmambrosino@gmail.com> -# Contributor: moostik <mooostik_at_gmail.com> - -pkgname=audex -pkgver=0.77b1 -pkgrel=1 -pkgdesc="A CDDA extraction tool with a ftp upload function for KDE" -arch=('i686' 'x86_64' 'mips64el') -url="http://kde-apps.org/content/show.php?content=77125" -license=('GPL') -depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'cdparanoia') -makedepends=('cmake' 'automoc4') -optdepends=('vorbis-tools: OGG encoder' - 'faac: MP4/M4A/AAC encoder' - 'flac: FLAC encoder' - 'lame: MP3 encoder') -install=${pkgname}.install -#source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz" -source=("http://kde.maniatek.com/${pkgname}/files/${pkgname}-${pkgver}.tar.xz" - 'gcc47.patch') -md5sums=('1f3df64b60b15315e958e3e3b151fe92' - '64107bcf90e22910e57804be774822dd') - -build() { - cd ${pkgname}-${pkgver} - - patch -p1 -i "${srcdir}"/gcc47.patch - cd .. - - mkdir build - cd build - - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install -} diff --git a/community/audex/audex.install b/community/audex/audex.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/community/audex/audex.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community/audex/gcc47.patch b/community/audex/gcc47.patch deleted file mode 100644 index 3d0ccf024..000000000 --- a/community/audex/gcc47.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- audex-0.74b1.orig/utils/hashlist.cpp -+++ audex-0.74b1/utils/hashlist.cpp -@@ -15,7 +15,8 @@ - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -- -+ -+#include <unistd.h> - #include "hashlist.h" - - Hashlist::Hashlist() { - diff --git a/community/audex/google_regex.patch b/community/audex/google_regex.patch deleted file mode 100644 index 86917e66f..000000000 --- a/community/audex/google_regex.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- audex-0.74b1/utils/coverfetcher.cpp 2011-01-15 12:06:25.000000000 +0100 -+++ audex-0.74b1/utils/coverfetcher_new.cpp 2011-07-20 18:43:37.554588883 +0200 -@@ -162,7 +162,10 @@ - cover_tbnids.clear(); - cover_thumbnails.clear(); - -- QRegExp rx("<a\\shref=(\\/imgres\\?imgurl=[a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+)>[\\s\\n]*<img\\ssrc=([a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+).*>[\\s\\n]*</a>"); -+ QRegExp rx("<a\\shref=\"(\\/imgres\\?imgurl=[^\"]+)\">[\\s\\n]*<img[^>]+src=\"([^>]+)\"></a>"); -+ QString html = xml; -+ html.replace( QLatin1String("&"), QLatin1String("&") ); -+ - rx.setMinimal(TRUE); - - int pos = 0; int i = 0; diff --git a/community/chicken/PKGBUILD b/community/chicken/PKGBUILD index 30b176b8c..b851d61de 100644 --- a/community/chicken/PKGBUILD +++ b/community/chicken/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85275 2013-02-28 11:49:19Z arodseth $ +# $Id: PKGBUILD 86291 2013-03-14 20:09:27Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: <david@pako.st> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=chicken -pkgver=4.8.0.2 +pkgver=4.8.0.3 pkgrel=1 pkgdesc='Compiler for R5RS scheme, featuring handy extensions' arch=('x86_64' 'i686' 'mips64el') @@ -13,7 +13,7 @@ url='http://call-cc.org/' license=('BSD') depends=('gcc') source=("http://code.call-cc.org/releases/${pkgver%.*}/$pkgname-$pkgver.tar.gz") -sha256sums=('bf933f8cc4586b8b468c9abb8ec079a9f109ea20b5f12a1af2776f694e14791d') +sha256sums=('6a1414e6f35586e47d7f4470eaf1779a4f73dec664b14bebf8763dd804b399c3') build() { cd "$pkgname-$pkgver" @@ -25,7 +25,7 @@ package() { cd "$pkgname-$pkgver" make -j1 PLATFORM=linux PREFIX=/usr DESTDIR="$pkgdir" install - install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD index 18fd2b5f4..7fe7cf9fc 100644 --- a/community/connman/PKGBUILD +++ b/community/connman/PKGBUILD @@ -1,10 +1,10 @@ -#$Id: PKGBUILD 85296 2013-02-28 15:31:09Z dwallace $ +#$Id: PKGBUILD 86294 2013-03-14 20:45:45Z foutrelis $ # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com> pkgname=connman pkgver=1.12 -pkgrel=1 +pkgrel=2 pkgdesc="Wireless LAN network manager" url="http://connman.net/" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/gimp-ufraw/PKGBUILD b/community/gimp-ufraw/PKGBUILD new file mode 100644 index 000000000..d49c47cfa --- /dev/null +++ b/community/gimp-ufraw/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 86296 2013-03-14 20:51:33Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Tobias Kieslich <tobias@archlinux.org> +# Contributor: Martin Sugioarto <nakal@web.de> + +pkgname=gimp-ufraw +pkgver=0.19 +pkgrel=1 +pkgdesc='Converter for raw files; utility and GIMP plugin' +url='http://ufraw.sourceforge.net/' +arch=('x86_64' 'i686') +license=('GPL') +depends=('gtkimageview' 'exiv2' 'lcms' 'bzip2' 'desktop-file-utils' 'cfitsio' 'lensfun') +makedepends=('gimp' 'cinepaint') +optdepends=('gimp: to use the gimp import plugin for raw images' + 'cinepaint: to use the cinepaint import plugin for raw images') +install="$pkgname.install" +source=("http://downloads.sourceforge.net/ufraw/ufraw-$pkgver.tar.gz") +sha256sums=('12d551418c5e69ae904cb92e9ac11b4d2e4327a857ee13ac890f34320eb58b9a') + +build() { + cd "$srcdir/ufraw-$pkgver" + + ./configure \ + --prefix=/usr \ + --enable-extras \ + --enable-mime \ + --enable-openmp \ + --with-gimp \ + --with-cinepaint \ + --enable-contrast + sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile + make +} + +package() { + cd "$srcdir/ufraw-$pkgver" + + make DESTDIR="$pkgdir" install + rm -f "$pkgdir/usr/bin/dcraw" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/haveged/PKGBUILD b/community/haveged/PKGBUILD index 1e046e5d1..a0ebc3229 100644 --- a/community/haveged/PKGBUILD +++ b/community/haveged/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 86237 2013-03-13 19:59:28Z bpiotrowski $ +# $Id: PKGBUILD 86268 2013-03-14 14:36:13Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: kfgz <kfgz at interia dot pl> # Contributor: pootzko <pootzko at gmail dot com> pkgname=haveged -pkgver=1.7a +pkgver=1.7.a +_pkgver=${pkgver/.a/a} pkgrel=1 pkgdesc='Entropy harvesting daemon using CPU timings' arch=('i686' 'x86_64' 'mips64el') url='http://www.issihosts.com/haveged' license=('GPL') depends=('glibc') -source=($url/$pkgname-$pkgver.tar.gz +source=($url/$pkgname-$_pkgver.tar.gz service) sha256sums=('8e7b0779bd8a4b9b73769ddaf626918355e2a542d3ac35e5ec31b74a58b9b051' '85aed005b7d0d0bae74f7fc0ca70907a6f67ddbcb2df77ca004f9a919028564a') build() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-$_pkgver ./configure --prefix=/usr make } package() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgname-$_pkgver make DESTDIR=$pkgdir install rm -rf $pkgdir/etc/init.d diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index 2b6b6df37..32392804c 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83817 2013-02-05 10:54:36Z spupykin $ +# $Id: PKGBUILD 86248 2013-03-14 10:44:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com> @@ -7,7 +7,7 @@ pkgbase=lazarus pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt') pkgver=1.0.6 _pkgsubver=0 -pkgrel=1 +pkgrel=2 url='http://www.lazarus.freepascal.org/' license=('GPL2' 'MPL' 'custom:LGPL') arch=('i686' 'x86_64' 'mips64el') diff --git a/community/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD deleted file mode 100755 index 153294933..000000000 --- a/community/lightdm-gtk2-greeter/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 86201 2013-03-13 00:23:53Z alucryd $ -# Maintainer: Maxime Gauduin <alucryd@gmail.com> -# Contributor: Padfoot <padfoot@exemail.com.au> - -pkgname=lightdm-gtk2-greeter -pkgver=1.5.1 -pkgrel=3 -pkgdesc="GTK+ greeter for LightDM" -arch=('i686' 'x86_64') -url="https://launchpad.net/lightdm-gtk-greeter" -license=('GPL3' 'LGPL3') -depends=('gtk2' 'lightdm') -makedepends=('exo' 'gnome-common' 'gnome-doc-utils' 'gobject-introspection' 'intltool') -provides=("${pkgname/2/}") -conflicts=("${pkgname/2/3}") -backup=('etc/lightdm/lightdm-gtk-greeter.conf') -source=("https://launchpad.net/${pkgname/2/}/1.6/${pkgver}/+download/${pkgname/2/}-${pkgver}.tar.gz" - "onscreen-keyboard.patch") -sha256sums=('ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621' - '381c4da15ed2482800aaf3258217cd48c2313aee5da4f7ade77f7ef55659d0b9') - -build() { - cd "${srcdir}"/${pkgname/2/}-${pkgver} - -# Patch - patch -Np1 -i ../onscreen-keyboard.patch - -# Build - AUTOMAKE=automake ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static --with-gtk2 - make -} - -package() { - cd "${srcdir}"/${pkgname/2/}-${pkgver} - -# Install - make DESTDIR="${pkgdir}" install -} - -# vim: ts=2 sw=2 et: diff --git a/community/lightdm-gtk2-greeter/onscreen-keyboard.patch b/community/lightdm-gtk2-greeter/onscreen-keyboard.patch deleted file mode 100755 index 6db01d3f6..000000000 --- a/community/lightdm-gtk2-greeter/onscreen-keyboard.patch +++ /dev/null @@ -1,306 +0,0 @@ -diff -aur lightdm-gtk-greeter-1.5.1.src/data/lightdm-gtk-greeter.conf lightdm-gtk-greeter-1.5.1.patch/data/lightdm-gtk-greeter.conf ---- lightdm-gtk-greeter-1.5.1.src/data/lightdm-gtk-greeter.conf 2013-02-11 00:19:17.000000000 +1100 -+++ lightdm-gtk-greeter-1.5.1.patch/data/lightdm-gtk-greeter.conf 2013-02-20 19:17:39.382817993 +1100 -@@ -9,6 +9,7 @@ - # xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr) - # show-language-selector (true or false) - # show-indicators = semi-colon ";" separated list of allowed indicator modules (e.g. indicator-sound.so) -+# keyboard = Command to launch on screen keyboard. Ensure it does not steal focus. - # - [greeter] - #background= -@@ -21,3 +22,4 @@ - #xft-rgba= - #show-language-selector= - #show-indicators= -+#keyboard= -diff -aur lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.c lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.c ---- lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.c 2013-02-11 00:48:21.000000000 +1100 -+++ lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.c 2013-02-20 20:09:30.219150045 +1100 -@@ -23,6 +23,7 @@ - #include <cairo-xlib.h> - #include <gdk-pixbuf/gdk-pixbuf.h> - #include <gdk/gdkx.h> -+#include <glib.h> - - #ifdef HAVE_LIBINDICATOR - #include <libindicator/indicator-object.h> -@@ -44,6 +45,7 @@ - static GtkComboBox *user_combo; - static GtkComboBox *session_combo; - static GtkComboBox *language_combo; -+static GtkCheckMenuItem *keyboard_menuitem; - static gchar *default_font_name, *default_theme_name, *default_icon_theme_name; - static GdkPixbuf *default_background_pixbuf = NULL; - #if GTK_CHECK_VERSION (3, 0, 0) -@@ -52,6 +54,10 @@ - static GdkColor *default_background_color = NULL; - #endif - static gboolean cancelling = FALSE, prompted = FALSE; -+static gchar **a11y_keyboard_command; -+static int a11y_kbd_pid = 0; -+static GPid *a11y_keyboard_pid = &a11y_kbd_pid; -+static GError *a11y_keyboard_error; - - - #ifdef HAVE_LIBINDICATOR -@@ -649,7 +655,10 @@ - if (lightdm_greeter_get_is_authenticated (greeter)) - { - if (prompted) -- start_session (); -+ { -+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (keyboard_menuitem), FALSE); -+ start_session (); -+ } - } - else - { -@@ -864,6 +873,32 @@ - } - } - -+void a11y_keyboard_cb (GtkWidget *widget); -+G_MODULE_EXPORT -+void -+a11y_keyboard_cb (GtkWidget *widget) -+{ -+ if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) -+ { -+ if (!g_spawn_async(NULL, a11y_keyboard_command, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, a11y_keyboard_pid, &a11y_keyboard_error)) -+ { -+ g_debug ("a11y keyboard command error : '%s'", a11y_keyboard_error->message); -+ a11y_kbd_pid = 0; -+ g_clear_error(&a11y_keyboard_error); -+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (widget), FALSE); -+ } -+ } -+ else -+ { -+ if (a11y_kbd_pid != 0) -+ { -+ kill (a11y_kbd_pid, SIGTERM); -+ g_spawn_close_pid(*a11y_keyboard_pid); -+ a11y_kbd_pid = 0; -+ } -+ } -+} -+ - static void - sigterm_cb (int signum) - { -@@ -1190,6 +1225,13 @@ - g_object_set (gtk_settings_get_default (), "gtk-xft-rgba", value, NULL); - g_free (value); - -+ /* Get a11y on screen keyboard command*/ -+ gint argp; -+ value = g_key_file_get_value (config, "greeter", "keyboard", NULL); -+ g_debug ("a11y keyboard command is '%s'", value); -+ g_shell_parse_argv (value, &argp, &a11y_keyboard_command, NULL); -+ g_free (value); -+ - builder = gtk_builder_new (); - if (!gtk_builder_add_from_string (builder, lightdm_gtk_greeter_ui, - lightdm_gtk_greeter_ui_length, &error)) -@@ -1212,6 +1254,7 @@ - language_combo = GTK_COMBO_BOX (gtk_builder_get_object (builder, "language_combobox")); - panel_window = GTK_WINDOW (gtk_builder_get_object (builder, "panel_window")); - user_avatar = GTK_IMAGE (gtk_builder_get_object (builder, "user_avatar")); -+ keyboard_menuitem = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "keyboard_menuitem")); - - gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (builder, "hostname_label")), lightdm_get_hostname ()); - -@@ -1264,7 +1307,7 @@ - #endif - gtk_widget_show (hbox); - gtk_container_add (GTK_CONTAINER (menuitem), hbox); -- image = gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_MENU); -+ image = gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image); - gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0); - -@@ -1276,7 +1319,7 @@ - #endif - gtk_widget_show (hbox); - gtk_container_add (GTK_CONTAINER (menuitem), hbox); -- image = gtk_image_new_from_icon_name ("preferences-desktop-accessibility", GTK_ICON_SIZE_MENU); -+ image = gtk_image_new_from_icon_name ("preferences-desktop-accessibility", GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image); - gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0); - -@@ -1377,6 +1420,11 @@ - gtk_widget_show (GTK_WIDGET (login_window)); - gdk_window_focus (gtk_widget_get_window (GTK_WIDGET (login_window)), GDK_CURRENT_TIME); - -+ if (a11y_keyboard_command) -+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (keyboard_menuitem), TRUE); -+ else -+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "keyboard_menuitem"))); -+ - gtk_main (); - - if (default_background_pixbuf) -diff -aur lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.glade lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.glade ---- lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.glade 2013-02-10 23:48:19.000000000 +1100 -+++ lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.glade 2013-02-20 17:11:01.968469713 +1100 -@@ -215,6 +215,7 @@ - <object class="GtkWindow" id="panel_window"> - <property name="name">panel_window</property> - <property name="can_focus">False</property> -+ <property name="default_height">40</property> - <property name="decorated">False</property> - <property name="has_resize_grip">False</property> - <child> -@@ -309,6 +310,16 @@ - <signal name="toggled" handler="a11y_contrast_cb" swapped="no"/> - </object> - </child> -+ <child> -+ <object class="GtkCheckMenuItem" id="keyboard_menuitem"> -+ <property name="name">keyboard_menuitem</property> -+ <property name="visible">True</property> -+ <property name="can_focus">False</property> -+ <property name="use_action_appearance">False</property> -+ <property name="label" translatable="yes">On Screen Keyboard</property> -+ <signal name="toggled" handler="a11y_keyboard_cb" swapped="no"/> -+ </object> -+ </child> - </object> - </child> - </object> -diff -aur lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter-ui.h lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter-ui.h ---- lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter-ui.h 2013-02-11 01:46:04.000000000 +1100 -+++ lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter-ui.h 2013-02-20 17:52:56.172967000 +1100 -@@ -108,66 +108,73 @@ - "\">3</property></packing></child></object></child><child type=\"tab\"><" - "placeholder/></child></object></child></object><object class=\"GtkWindo" - "w\" id=\"panel_window\"><property name=\"name\">panel_window</property>" -- "<property name=\"can_focus\">False</property><property name=\"decorated" -- "\">False</property><property name=\"has_resize_grip\">False</property><" -- "child><object class=\"GtkMenuBar\" id=\"menubar\"><property name=\"name" -- "\">menubar</property><property name=\"visible\">True</property><propert" -- "y name=\"can_focus\">False</property><property name=\"pack_direction\">" -- "rtl</property><child><object class=\"GtkMenuItem\" id=\"power_menuitem\"" -- "><property name=\"name\">power_menuitem</property><property name=\"visi" -- "ble\">True</property><property name=\"can_focus\">False</property><prop" -- "erty name=\"use_action_appearance\">False</property><child type=\"subme" -- "nu\"><object class=\"GtkMenu\" id=\"power_menu\"><property name=\"name\"" -- ">power_menu</property><property name=\"visible\">True</property><proper" -- "ty name=\"can_focus\">False</property><child><object class=\"GtkMenuIte" -- "m\" id=\"suspend_menuitem\"><property name=\"name\">suspend_menuitem</p" -- "roperty><property name=\"visible\">True</property><property name=\"can_" -- "focus\">False</property><property name=\"use_action_appearance\">False<" -- "/property><property name=\"label\" translatable=\"yes\">Suspend</proper" -- "ty><signal name=\"activate\" handler=\"suspend_cb\" swapped=\"no\"/></o" -- "bject></child><child><object class=\"GtkMenuItem\" id=\"hibernate_menui" -- "tem\"><property name=\"name\">hibernate_menuitem</property><property na" -- "me=\"visible\">True</property><property name=\"can_focus\">False</prope" -- "rty><property name=\"use_action_appearance\">False</property><property " -- "name=\"label\" translatable=\"yes\">Hibernate</property><signal name=\"" -- "activate\" handler=\"hibernate_cb\" swapped=\"no\"/></object></child><c" -- "hild><object class=\"GtkMenuItem\" id=\"restart_menuitem\"><property na" -- "me=\"name\">restart_menuitem</property><property name=\"visible\">True<" -- "/property><property name=\"can_focus\">False</property><property name=\"" -- "use_action_appearance\">False</property><property name=\"label\" transl" -- "atable=\"yes\">Restart...</property><signal name=\"activate\" handler=\"" -- "restart_cb\" swapped=\"no\"/></object></child><child><object class=\"Gt" -- "kMenuItem\" id=\"shutdown_menuitem\"><property name=\"name\">shutdown_m" -- "enuitem</property><property name=\"visible\">True</property><property n" -- "ame=\"can_focus\">False</property><property name=\"use_action_appearanc" -- "e\">False</property><property name=\"label\" translatable=\"yes\">Shutd" -- "own...</property><signal name=\"activate\" handler=\"shutdown_cb\" swap" -- "ped=\"no\"/></object></child></object></child></object></child><child><" -- "object class=\"GtkMenuItem\" id=\"a11y_menuitem\"><property name=\"name" -- "\">a11y_menuitem</property><property name=\"visible\">True</property><p" -- "roperty name=\"can_focus\">False</property><property name=\"use_action_" -- "appearance\">False</property><child type=\"submenu\"><object class=\"Gt" -- "kMenu\" id=\"a11y_menu\"><property name=\"name\">a11y_menu</property><p" -- "roperty name=\"visible\">True</property><property name=\"can_focus\">Fa" -- "lse</property><child><object class=\"GtkCheckMenuItem\" id=\"large_font" -- "_menuitem\"><property name=\"name\">large_font_menuitem</property><prop" -+ "<property name=\"can_focus\">False</property><property name=\"default_h" -+ "eight\">40</property><property name=\"decorated\">False</property><prop" -+ "erty name=\"has_resize_grip\">False</property><child><object class=\"Gt" -+ "kMenuBar\" id=\"menubar\"><property name=\"name\">menubar</property><pr" -+ "operty name=\"visible\">True</property><property name=\"can_focus\">Fal" -+ "se</property><property name=\"pack_direction\">rtl</property><child><ob" -+ "ject class=\"GtkMenuItem\" id=\"power_menuitem\"><property name=\"name\"" -+ ">power_menuitem</property><property name=\"visible\">True</property><pr" -+ "operty name=\"can_focus\">False</property><property name=\"use_action_a" -+ "ppearance\">False</property><child type=\"submenu\"><object class=\"Gtk" -+ "Menu\" id=\"power_menu\"><property name=\"name\">power_menu</property><" -+ "property name=\"visible\">True</property><property name=\"can_focus\">F" -+ "alse</property><child><object class=\"GtkMenuItem\" id=\"suspend_menuit" -+ "em\"><property name=\"name\">suspend_menuitem</property><property name=" -+ "\"visible\">True</property><property name=\"can_focus\">False</property" -+ "><property name=\"use_action_appearance\">False</property><property nam" -+ "e=\"label\" translatable=\"yes\">Suspend</property><signal name=\"activ" -+ "ate\" handler=\"suspend_cb\" swapped=\"no\"/></object></child><child><o" -+ "bject class=\"GtkMenuItem\" id=\"hibernate_menuitem\"><property name=\"" -+ "name\">hibernate_menuitem</property><property name=\"visible\">True</pr" -+ "operty><property name=\"can_focus\">False</property><property name=\"us" -+ "e_action_appearance\">False</property><property name=\"label\" translat" -+ "able=\"yes\">Hibernate</property><signal name=\"activate\" handler=\"hi" -+ "bernate_cb\" swapped=\"no\"/></object></child><child><object class=\"Gt" -+ "kMenuItem\" id=\"restart_menuitem\"><property name=\"name\">restart_men" -+ "uitem</property><property name=\"visible\">True</property><property nam" -+ "e=\"can_focus\">False</property><property name=\"use_action_appearance\"" -+ ">False</property><property name=\"label\" translatable=\"yes\">Restart." -+ "..</property><signal name=\"activate\" handler=\"restart_cb\" swapped=\"" -+ "no\"/></object></child><child><object class=\"GtkMenuItem\" id=\"shutdo" -+ "wn_menuitem\"><property name=\"name\">shutdown_menuitem</property><prop" - "erty name=\"visible\">True</property><property name=\"can_focus\">False" - "</property><property name=\"use_action_appearance\">False</property><pr" -- "operty name=\"label\" translatable=\"yes\">Large Font</property><signal" -- " name=\"toggled\" handler=\"a11y_font_cb\" swapped=\"no\"/></object></c" -- "hild><child><object class=\"GtkCheckMenuItem\" id=\"high_contrast_menui" -- "tem\"><property name=\"name\">high_contrast_menuitem</property><propert" -- "y name=\"visible\">True</property><property name=\"can_focus\">False</p" -- "roperty><property name=\"use_action_appearance\">False</property><prope" -- "rty name=\"label\" translatable=\"yes\">High Contrast</property><signal" -- " name=\"toggled\" handler=\"a11y_contrast_cb\" swapped=\"no\"/></object" -- "></child></object></child></object></child></object></child></object><o" -- "bject class=\"GtkListStore\" id=\"session_liststore\"><columns><column " -- "type=\"gchararray\"/><column type=\"gchararray\"/></columns></object><o" -- "bject class=\"GtkListStore\" id=\"user_liststore\"><columns><column typ" -- "e=\"gchararray\"/><column type=\"gchararray\"/><column type=\"gint\"/><" -- "/columns></object></interface>" -+ "operty name=\"label\" translatable=\"yes\">Shutdown...</property><signa" -+ "l name=\"activate\" handler=\"shutdown_cb\" swapped=\"no\"/></object></" -+ "child></object></child></object></child><child><object class=\"GtkMenuI" -+ "tem\" id=\"a11y_menuitem\"><property name=\"name\">a11y_menuitem</prope" -+ "rty><property name=\"visible\">True</property><property name=\"can_focu" -+ "s\">False</property><property name=\"use_action_appearance\">False</pro" -+ "perty><child type=\"submenu\"><object class=\"GtkMenu\" id=\"a11y_menu\"" -+ "><property name=\"name\">a11y_menu</property><property name=\"visible\"" -+ ">True</property><property name=\"can_focus\">False</property><child><ob" -+ "ject class=\"GtkCheckMenuItem\" id=\"large_font_menuitem\"><property na" -+ "me=\"name\">large_font_menuitem</property><property name=\"visible\">Tr" -+ "ue</property><property name=\"can_focus\">False</property><property nam" -+ "e=\"use_action_appearance\">False</property><property name=\"label\" tr" -+ "anslatable=\"yes\">Large Font</property><signal name=\"toggled\" handle" -+ "r=\"a11y_font_cb\" swapped=\"no\"/></object></child><child><object clas" -+ "s=\"GtkCheckMenuItem\" id=\"high_contrast_menuitem\"><property name=\"n" -+ "ame\">high_contrast_menuitem</property><property name=\"visible\">True<" -+ "/property><property name=\"can_focus\">False</property><property name=\"" -+ "use_action_appearance\">False</property><property name=\"label\" transl" -+ "atable=\"yes\">High Contrast</property><signal name=\"toggled\" handler" -+ "=\"a11y_contrast_cb\" swapped=\"no\"/></object></child><child><object c" -+ "lass=\"GtkCheckMenuItem\" id=\"keyboard_menuitem\"><property name=\"nam" -+ "e\">keyboard_menuitem</property><property name=\"visible\">True</proper" -+ "ty><property name=\"can_focus\">False</property><property name=\"use_ac" -+ "tion_appearance\">False</property><property name=\"label\" translatable" -+ "=\"yes\">On Screen Keyboard</property><signal name=\"toggled\" handler=" -+ "\"a11y_keyboard_cb\" swapped=\"no\"/></object></child></object></child>" -+ "</object></child></object></child></object><object class=\"GtkListStore" -+ "\" id=\"session_liststore\"><columns><column type=\"gchararray\"/><colu" -+ "mn type=\"gchararray\"/></columns></object><object class=\"GtkListStore" -+ "\" id=\"user_liststore\"><columns><column type=\"gchararray\"/><column " -+ "type=\"gchararray\"/><column type=\"gint\"/></columns></object></interf" -+ "ace>" - }; - --static const unsigned lightdm_gtk_greeter_ui_length = 10699u; -+static const unsigned lightdm_gtk_greeter_ui_length = 11147u; - diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD index 951bfe25d..f34d28452 100755 --- a/community/lightdm-gtk3-greeter/PKGBUILD +++ b/community/lightdm-gtk3-greeter/PKGBUILD @@ -1,32 +1,27 @@ -# $Id: PKGBUILD 86202 2013-03-13 00:26:13Z alucryd $ +# $Id: PKGBUILD 86256 2013-03-14 11:39:30Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Padfoot <padfoot@exemail.com.au> pkgname=lightdm-gtk3-greeter -pkgver=1.5.1 +pkgver=1.3.1 pkgrel=1 +epoch=1 pkgdesc="GTK+ greeter for LightDM" arch=('i686' 'x86_64') url="https://launchpad.net/lightdm-gtk-greeter" license=('GPL3' 'LGPL3') depends=('gtk3' 'lightdm') -makedepends=('exo' 'gnome-common' 'gnome-doc-utils' 'gobject-introspection' 'intltool') +makedepends=('exo' 'gnome-doc-utils' 'gobject-introspection' 'intltool') provides=("${pkgname/3/}") -conflicts=("${pkgname/3/2}") backup=('etc/lightdm/lightdm-gtk-greeter.conf') -source=("https://launchpad.net/${pkgname/3/}/1.6/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz" - "onscreen-keyboard.patch") -sha256sums=('ecce7e917a79fa8f2126c3fafb6337f81f2198892159a4ef695016afecd2d621' - '381c4da15ed2482800aaf3258217cd48c2313aee5da4f7ade77f7ef55659d0b9') +source=("https://launchpad.net/${pkgname/3/}/1.4/${pkgver}/+download/${pkgname/3/}-${pkgver}.tar.gz") +sha256sums=('a384b6413a52e6c6aeaf3242b2420e857ad7e2e4e5bec47da663e67076c0ee87') build() { cd "${srcdir}"/${pkgname/3/}-${pkgver} -# Patch - patch -Np1 -i ../onscreen-keyboard.patch - # Build - AUTOMAKE=automake ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/lightdm --disable-static make } diff --git a/community/lightdm-gtk3-greeter/onscreen-keyboard.patch b/community/lightdm-gtk3-greeter/onscreen-keyboard.patch deleted file mode 100755 index 6db01d3f6..000000000 --- a/community/lightdm-gtk3-greeter/onscreen-keyboard.patch +++ /dev/null @@ -1,306 +0,0 @@ -diff -aur lightdm-gtk-greeter-1.5.1.src/data/lightdm-gtk-greeter.conf lightdm-gtk-greeter-1.5.1.patch/data/lightdm-gtk-greeter.conf ---- lightdm-gtk-greeter-1.5.1.src/data/lightdm-gtk-greeter.conf 2013-02-11 00:19:17.000000000 +1100 -+++ lightdm-gtk-greeter-1.5.1.patch/data/lightdm-gtk-greeter.conf 2013-02-20 19:17:39.382817993 +1100 -@@ -9,6 +9,7 @@ - # xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr) - # show-language-selector (true or false) - # show-indicators = semi-colon ";" separated list of allowed indicator modules (e.g. indicator-sound.so) -+# keyboard = Command to launch on screen keyboard. Ensure it does not steal focus. - # - [greeter] - #background= -@@ -21,3 +22,4 @@ - #xft-rgba= - #show-language-selector= - #show-indicators= -+#keyboard= -diff -aur lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.c lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.c ---- lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.c 2013-02-11 00:48:21.000000000 +1100 -+++ lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.c 2013-02-20 20:09:30.219150045 +1100 -@@ -23,6 +23,7 @@ - #include <cairo-xlib.h> - #include <gdk-pixbuf/gdk-pixbuf.h> - #include <gdk/gdkx.h> -+#include <glib.h> - - #ifdef HAVE_LIBINDICATOR - #include <libindicator/indicator-object.h> -@@ -44,6 +45,7 @@ - static GtkComboBox *user_combo; - static GtkComboBox *session_combo; - static GtkComboBox *language_combo; -+static GtkCheckMenuItem *keyboard_menuitem; - static gchar *default_font_name, *default_theme_name, *default_icon_theme_name; - static GdkPixbuf *default_background_pixbuf = NULL; - #if GTK_CHECK_VERSION (3, 0, 0) -@@ -52,6 +54,10 @@ - static GdkColor *default_background_color = NULL; - #endif - static gboolean cancelling = FALSE, prompted = FALSE; -+static gchar **a11y_keyboard_command; -+static int a11y_kbd_pid = 0; -+static GPid *a11y_keyboard_pid = &a11y_kbd_pid; -+static GError *a11y_keyboard_error; - - - #ifdef HAVE_LIBINDICATOR -@@ -649,7 +655,10 @@ - if (lightdm_greeter_get_is_authenticated (greeter)) - { - if (prompted) -- start_session (); -+ { -+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (keyboard_menuitem), FALSE); -+ start_session (); -+ } - } - else - { -@@ -864,6 +873,32 @@ - } - } - -+void a11y_keyboard_cb (GtkWidget *widget); -+G_MODULE_EXPORT -+void -+a11y_keyboard_cb (GtkWidget *widget) -+{ -+ if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) -+ { -+ if (!g_spawn_async(NULL, a11y_keyboard_command, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, a11y_keyboard_pid, &a11y_keyboard_error)) -+ { -+ g_debug ("a11y keyboard command error : '%s'", a11y_keyboard_error->message); -+ a11y_kbd_pid = 0; -+ g_clear_error(&a11y_keyboard_error); -+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (widget), FALSE); -+ } -+ } -+ else -+ { -+ if (a11y_kbd_pid != 0) -+ { -+ kill (a11y_kbd_pid, SIGTERM); -+ g_spawn_close_pid(*a11y_keyboard_pid); -+ a11y_kbd_pid = 0; -+ } -+ } -+} -+ - static void - sigterm_cb (int signum) - { -@@ -1190,6 +1225,13 @@ - g_object_set (gtk_settings_get_default (), "gtk-xft-rgba", value, NULL); - g_free (value); - -+ /* Get a11y on screen keyboard command*/ -+ gint argp; -+ value = g_key_file_get_value (config, "greeter", "keyboard", NULL); -+ g_debug ("a11y keyboard command is '%s'", value); -+ g_shell_parse_argv (value, &argp, &a11y_keyboard_command, NULL); -+ g_free (value); -+ - builder = gtk_builder_new (); - if (!gtk_builder_add_from_string (builder, lightdm_gtk_greeter_ui, - lightdm_gtk_greeter_ui_length, &error)) -@@ -1212,6 +1254,7 @@ - language_combo = GTK_COMBO_BOX (gtk_builder_get_object (builder, "language_combobox")); - panel_window = GTK_WINDOW (gtk_builder_get_object (builder, "panel_window")); - user_avatar = GTK_IMAGE (gtk_builder_get_object (builder, "user_avatar")); -+ keyboard_menuitem = GTK_CHECK_MENU_ITEM (gtk_builder_get_object (builder, "keyboard_menuitem")); - - gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (builder, "hostname_label")), lightdm_get_hostname ()); - -@@ -1264,7 +1307,7 @@ - #endif - gtk_widget_show (hbox); - gtk_container_add (GTK_CONTAINER (menuitem), hbox); -- image = gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_MENU); -+ image = gtk_image_new_from_icon_name ("system-shutdown", GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image); - gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0); - -@@ -1276,7 +1319,7 @@ - #endif - gtk_widget_show (hbox); - gtk_container_add (GTK_CONTAINER (menuitem), hbox); -- image = gtk_image_new_from_icon_name ("preferences-desktop-accessibility", GTK_ICON_SIZE_MENU); -+ image = gtk_image_new_from_icon_name ("preferences-desktop-accessibility", GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image); - gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0); - -@@ -1377,6 +1420,11 @@ - gtk_widget_show (GTK_WIDGET (login_window)); - gdk_window_focus (gtk_widget_get_window (GTK_WIDGET (login_window)), GDK_CURRENT_TIME); - -+ if (a11y_keyboard_command) -+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (keyboard_menuitem), TRUE); -+ else -+ gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object (builder, "keyboard_menuitem"))); -+ - gtk_main (); - - if (default_background_pixbuf) -diff -aur lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.glade lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.glade ---- lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter.glade 2013-02-10 23:48:19.000000000 +1100 -+++ lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter.glade 2013-02-20 17:11:01.968469713 +1100 -@@ -215,6 +215,7 @@ - <object class="GtkWindow" id="panel_window"> - <property name="name">panel_window</property> - <property name="can_focus">False</property> -+ <property name="default_height">40</property> - <property name="decorated">False</property> - <property name="has_resize_grip">False</property> - <child> -@@ -309,6 +310,16 @@ - <signal name="toggled" handler="a11y_contrast_cb" swapped="no"/> - </object> - </child> -+ <child> -+ <object class="GtkCheckMenuItem" id="keyboard_menuitem"> -+ <property name="name">keyboard_menuitem</property> -+ <property name="visible">True</property> -+ <property name="can_focus">False</property> -+ <property name="use_action_appearance">False</property> -+ <property name="label" translatable="yes">On Screen Keyboard</property> -+ <signal name="toggled" handler="a11y_keyboard_cb" swapped="no"/> -+ </object> -+ </child> - </object> - </child> - </object> -diff -aur lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter-ui.h lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter-ui.h ---- lightdm-gtk-greeter-1.5.1.src/src/lightdm-gtk-greeter-ui.h 2013-02-11 01:46:04.000000000 +1100 -+++ lightdm-gtk-greeter-1.5.1.patch/src/lightdm-gtk-greeter-ui.h 2013-02-20 17:52:56.172967000 +1100 -@@ -108,66 +108,73 @@ - "\">3</property></packing></child></object></child><child type=\"tab\"><" - "placeholder/></child></object></child></object><object class=\"GtkWindo" - "w\" id=\"panel_window\"><property name=\"name\">panel_window</property>" -- "<property name=\"can_focus\">False</property><property name=\"decorated" -- "\">False</property><property name=\"has_resize_grip\">False</property><" -- "child><object class=\"GtkMenuBar\" id=\"menubar\"><property name=\"name" -- "\">menubar</property><property name=\"visible\">True</property><propert" -- "y name=\"can_focus\">False</property><property name=\"pack_direction\">" -- "rtl</property><child><object class=\"GtkMenuItem\" id=\"power_menuitem\"" -- "><property name=\"name\">power_menuitem</property><property name=\"visi" -- "ble\">True</property><property name=\"can_focus\">False</property><prop" -- "erty name=\"use_action_appearance\">False</property><child type=\"subme" -- "nu\"><object class=\"GtkMenu\" id=\"power_menu\"><property name=\"name\"" -- ">power_menu</property><property name=\"visible\">True</property><proper" -- "ty name=\"can_focus\">False</property><child><object class=\"GtkMenuIte" -- "m\" id=\"suspend_menuitem\"><property name=\"name\">suspend_menuitem</p" -- "roperty><property name=\"visible\">True</property><property name=\"can_" -- "focus\">False</property><property name=\"use_action_appearance\">False<" -- "/property><property name=\"label\" translatable=\"yes\">Suspend</proper" -- "ty><signal name=\"activate\" handler=\"suspend_cb\" swapped=\"no\"/></o" -- "bject></child><child><object class=\"GtkMenuItem\" id=\"hibernate_menui" -- "tem\"><property name=\"name\">hibernate_menuitem</property><property na" -- "me=\"visible\">True</property><property name=\"can_focus\">False</prope" -- "rty><property name=\"use_action_appearance\">False</property><property " -- "name=\"label\" translatable=\"yes\">Hibernate</property><signal name=\"" -- "activate\" handler=\"hibernate_cb\" swapped=\"no\"/></object></child><c" -- "hild><object class=\"GtkMenuItem\" id=\"restart_menuitem\"><property na" -- "me=\"name\">restart_menuitem</property><property name=\"visible\">True<" -- "/property><property name=\"can_focus\">False</property><property name=\"" -- "use_action_appearance\">False</property><property name=\"label\" transl" -- "atable=\"yes\">Restart...</property><signal name=\"activate\" handler=\"" -- "restart_cb\" swapped=\"no\"/></object></child><child><object class=\"Gt" -- "kMenuItem\" id=\"shutdown_menuitem\"><property name=\"name\">shutdown_m" -- "enuitem</property><property name=\"visible\">True</property><property n" -- "ame=\"can_focus\">False</property><property name=\"use_action_appearanc" -- "e\">False</property><property name=\"label\" translatable=\"yes\">Shutd" -- "own...</property><signal name=\"activate\" handler=\"shutdown_cb\" swap" -- "ped=\"no\"/></object></child></object></child></object></child><child><" -- "object class=\"GtkMenuItem\" id=\"a11y_menuitem\"><property name=\"name" -- "\">a11y_menuitem</property><property name=\"visible\">True</property><p" -- "roperty name=\"can_focus\">False</property><property name=\"use_action_" -- "appearance\">False</property><child type=\"submenu\"><object class=\"Gt" -- "kMenu\" id=\"a11y_menu\"><property name=\"name\">a11y_menu</property><p" -- "roperty name=\"visible\">True</property><property name=\"can_focus\">Fa" -- "lse</property><child><object class=\"GtkCheckMenuItem\" id=\"large_font" -- "_menuitem\"><property name=\"name\">large_font_menuitem</property><prop" -+ "<property name=\"can_focus\">False</property><property name=\"default_h" -+ "eight\">40</property><property name=\"decorated\">False</property><prop" -+ "erty name=\"has_resize_grip\">False</property><child><object class=\"Gt" -+ "kMenuBar\" id=\"menubar\"><property name=\"name\">menubar</property><pr" -+ "operty name=\"visible\">True</property><property name=\"can_focus\">Fal" -+ "se</property><property name=\"pack_direction\">rtl</property><child><ob" -+ "ject class=\"GtkMenuItem\" id=\"power_menuitem\"><property name=\"name\"" -+ ">power_menuitem</property><property name=\"visible\">True</property><pr" -+ "operty name=\"can_focus\">False</property><property name=\"use_action_a" -+ "ppearance\">False</property><child type=\"submenu\"><object class=\"Gtk" -+ "Menu\" id=\"power_menu\"><property name=\"name\">power_menu</property><" -+ "property name=\"visible\">True</property><property name=\"can_focus\">F" -+ "alse</property><child><object class=\"GtkMenuItem\" id=\"suspend_menuit" -+ "em\"><property name=\"name\">suspend_menuitem</property><property name=" -+ "\"visible\">True</property><property name=\"can_focus\">False</property" -+ "><property name=\"use_action_appearance\">False</property><property nam" -+ "e=\"label\" translatable=\"yes\">Suspend</property><signal name=\"activ" -+ "ate\" handler=\"suspend_cb\" swapped=\"no\"/></object></child><child><o" -+ "bject class=\"GtkMenuItem\" id=\"hibernate_menuitem\"><property name=\"" -+ "name\">hibernate_menuitem</property><property name=\"visible\">True</pr" -+ "operty><property name=\"can_focus\">False</property><property name=\"us" -+ "e_action_appearance\">False</property><property name=\"label\" translat" -+ "able=\"yes\">Hibernate</property><signal name=\"activate\" handler=\"hi" -+ "bernate_cb\" swapped=\"no\"/></object></child><child><object class=\"Gt" -+ "kMenuItem\" id=\"restart_menuitem\"><property name=\"name\">restart_men" -+ "uitem</property><property name=\"visible\">True</property><property nam" -+ "e=\"can_focus\">False</property><property name=\"use_action_appearance\"" -+ ">False</property><property name=\"label\" translatable=\"yes\">Restart." -+ "..</property><signal name=\"activate\" handler=\"restart_cb\" swapped=\"" -+ "no\"/></object></child><child><object class=\"GtkMenuItem\" id=\"shutdo" -+ "wn_menuitem\"><property name=\"name\">shutdown_menuitem</property><prop" - "erty name=\"visible\">True</property><property name=\"can_focus\">False" - "</property><property name=\"use_action_appearance\">False</property><pr" -- "operty name=\"label\" translatable=\"yes\">Large Font</property><signal" -- " name=\"toggled\" handler=\"a11y_font_cb\" swapped=\"no\"/></object></c" -- "hild><child><object class=\"GtkCheckMenuItem\" id=\"high_contrast_menui" -- "tem\"><property name=\"name\">high_contrast_menuitem</property><propert" -- "y name=\"visible\">True</property><property name=\"can_focus\">False</p" -- "roperty><property name=\"use_action_appearance\">False</property><prope" -- "rty name=\"label\" translatable=\"yes\">High Contrast</property><signal" -- " name=\"toggled\" handler=\"a11y_contrast_cb\" swapped=\"no\"/></object" -- "></child></object></child></object></child></object></child></object><o" -- "bject class=\"GtkListStore\" id=\"session_liststore\"><columns><column " -- "type=\"gchararray\"/><column type=\"gchararray\"/></columns></object><o" -- "bject class=\"GtkListStore\" id=\"user_liststore\"><columns><column typ" -- "e=\"gchararray\"/><column type=\"gchararray\"/><column type=\"gint\"/><" -- "/columns></object></interface>" -+ "operty name=\"label\" translatable=\"yes\">Shutdown...</property><signa" -+ "l name=\"activate\" handler=\"shutdown_cb\" swapped=\"no\"/></object></" -+ "child></object></child></object></child><child><object class=\"GtkMenuI" -+ "tem\" id=\"a11y_menuitem\"><property name=\"name\">a11y_menuitem</prope" -+ "rty><property name=\"visible\">True</property><property name=\"can_focu" -+ "s\">False</property><property name=\"use_action_appearance\">False</pro" -+ "perty><child type=\"submenu\"><object class=\"GtkMenu\" id=\"a11y_menu\"" -+ "><property name=\"name\">a11y_menu</property><property name=\"visible\"" -+ ">True</property><property name=\"can_focus\">False</property><child><ob" -+ "ject class=\"GtkCheckMenuItem\" id=\"large_font_menuitem\"><property na" -+ "me=\"name\">large_font_menuitem</property><property name=\"visible\">Tr" -+ "ue</property><property name=\"can_focus\">False</property><property nam" -+ "e=\"use_action_appearance\">False</property><property name=\"label\" tr" -+ "anslatable=\"yes\">Large Font</property><signal name=\"toggled\" handle" -+ "r=\"a11y_font_cb\" swapped=\"no\"/></object></child><child><object clas" -+ "s=\"GtkCheckMenuItem\" id=\"high_contrast_menuitem\"><property name=\"n" -+ "ame\">high_contrast_menuitem</property><property name=\"visible\">True<" -+ "/property><property name=\"can_focus\">False</property><property name=\"" -+ "use_action_appearance\">False</property><property name=\"label\" transl" -+ "atable=\"yes\">High Contrast</property><signal name=\"toggled\" handler" -+ "=\"a11y_contrast_cb\" swapped=\"no\"/></object></child><child><object c" -+ "lass=\"GtkCheckMenuItem\" id=\"keyboard_menuitem\"><property name=\"nam" -+ "e\">keyboard_menuitem</property><property name=\"visible\">True</proper" -+ "ty><property name=\"can_focus\">False</property><property name=\"use_ac" -+ "tion_appearance\">False</property><property name=\"label\" translatable" -+ "=\"yes\">On Screen Keyboard</property><signal name=\"toggled\" handler=" -+ "\"a11y_keyboard_cb\" swapped=\"no\"/></object></child></object></child>" -+ "</object></child></object></child></object><object class=\"GtkListStore" -+ "\" id=\"session_liststore\"><columns><column type=\"gchararray\"/><colu" -+ "mn type=\"gchararray\"/></columns></object><object class=\"GtkListStore" -+ "\" id=\"user_liststore\"><columns><column type=\"gchararray\"/><column " -+ "type=\"gchararray\"/><column type=\"gint\"/></columns></object></interf" -+ "ace>" - }; - --static const unsigned lightdm_gtk_greeter_ui_length = 10699u; -+static const unsigned lightdm_gtk_greeter_ui_length = 11147u; - diff --git a/community/lightdm-kde-greeter/PKGBUILD b/community/lightdm-kde-greeter/PKGBUILD index e1b9200b1..f9730bd45 100755 --- a/community/lightdm-kde-greeter/PKGBUILD +++ b/community/lightdm-kde-greeter/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86223 2013-03-13 14:28:38Z alucryd $ +# $Id: PKGBUILD 86258 2013-03-14 11:40:16Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Mladen Pejakovic <pejakm@gmail.com> @@ -6,7 +6,7 @@ pkgname=lightdm-kde-greeter pkgver=0.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="KDE greeter for LightDM" arch=('i686' 'x86_64') url="https://projects.kde.org/projects/playground/base/lightdm" diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD index c195eea24..9570465d6 100755 --- a/community/lightdm/PKGBUILD +++ b/community/lightdm/PKGBUILD @@ -1,35 +1,34 @@ -# $Id: PKGBUILD 86229 2013-03-13 18:51:51Z alucryd $ +# $Id: PKGBUILD 86254 2013-03-14 11:38:24Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: Morfeo <morfeo89@hotmail.it> pkgbase=lightdm -pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5') -pkgver=1.5.1 -pkgrel=6 +pkgname=('lightdm' 'liblightdm-qt4') +pkgver=1.4.0 +pkgrel=1 +epoch=1 pkgdesc="A lightweight display manager" arch=('i686' 'x86_64') url="https://launchpad.net/lightdm" license=('GPL3' 'LGPL3') -makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'qt4' 'qt5-base') +makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'qt4') options=('!emptydirs' '!libtool') -source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgver}.tar.xz" +source=("https://launchpad.net/lightdm/1.4/${pkgver}/+download/${pkgbase}-${pkgver}.tar.gz" 'lightdm.service' 'lightdm.tmpfiles' 'lightdm.pam' 'lightdm-autologin.pam' 'lightdm.rules' 'lightdm-default-config.patch' - 'lightdm-1.5.1-systemd_login1_power.patch' 'lightdm-lock-screen-before-switch.patch' 'xsession') -sha256sums=('645db2d763cc514d6aecb1838f4a9c33c3dcf0c94567a7ef36c6b23d8aa56c86' +sha256sums=('3486a9f828864a78d452696cf6fef6e1dec2f4ef92a72e90ab37edf9a0824c43' '2e03423cbe88c9fdc3a9684d6d14221aa6e92d105f9d1d53b08747d966c45125' 'ec10378992907f06a6960c4644aba2f81744fbcaf38f6bdc7c364979be3207e4' 'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0' 'cd0a9591b61118c6de1b07e1cd9a1b74cd74e9e95288f8b41eba32e26fd22023' 'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6' '51ec7eb1c50c0ba0b96b846662707533ebc1d6558cea75cb7424afddf0d064f0' - '8c8432294d361475293852f45673bc042eb252dbc58a17445fd10e5e874dc608' '4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822' '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4') @@ -38,7 +37,6 @@ build() { # Patch patch -Np1 -i ../lightdm-default-config.patch - patch -Np1 -i ../lightdm-1.5.1-systemd_login1_power.patch patch -Np1 -i ../lightdm-lock-screen-before-switch.patch # Build @@ -47,7 +45,7 @@ build() { } package_lightdm() { -depends=('libgcrypt' 'libxklavier' 'pam') +depends=('libxklavier' 'pam') optdepends=('xorg-server-xephyr: LightDM test mode' 'accountsservice: limit visible accounts') backup=('etc/apparmor.d/lightdm-guest-session' @@ -88,24 +86,6 @@ depends=('lightdm' 'qt4') make DESTDIR="${pkgdir}" -C liblightdm-gobject install make DESTDIR="${pkgdir}" -C liblightdm-qt install make DESTDIR="${pkgdir}" -C liblightdm-gobject uninstall - find "${pkgdir}" -type d -name *qt5* -exec rm -rf {} + - find "${pkgdir}" -type f -name *qt5* -exec rm {} + - find "${pkgdir}" -type l -name *qt5* -exec rm {} + -} - -package_liblightdm-qt5() { -pkgdesc=('LightDM Qt client library') -depends=('lightdm' 'qt5-base') - - cd "${srcdir}"/${pkgbase}-${pkgver} - -# Install - make DESTDIR="${pkgdir}" -C liblightdm-gobject install - make DESTDIR="${pkgdir}" -C liblightdm-qt install - make DESTDIR="${pkgdir}" -C liblightdm-gobject uninstall - find "${pkgdir}" -type d -name *qt[!5]* -exec rm -rf {} + - find "${pkgdir}" -type f -name *qt[!5]* -exec rm {} + - find "${pkgdir}" -type l -name *qt[!5]* -exec rm {} + } # vim: ts=2 sw=2 et: diff --git a/community/lightdm/lightdm-1.5.1-systemd_login1_power.patch b/community/lightdm/lightdm-1.5.1-systemd_login1_power.patch deleted file mode 100755 index 0bcb24589..000000000 --- a/community/lightdm/lightdm-1.5.1-systemd_login1_power.patch +++ /dev/null @@ -1,211 +0,0 @@ -diff -up lightdm-1.5.1/liblightdm-gobject/power.c.systemd_login1_power lightdm-1.5.1/liblightdm-gobject/power.c ---- lightdm-1.5.1/liblightdm-gobject/power.c.systemd_login1_power 2013-03-05 20:40:10.000000000 -0600 -+++ lightdm-1.5.1/liblightdm-gobject/power.c 2013-03-09 11:31:00.169897568 -0600 -@@ -17,6 +17,7 @@ - - static GDBusProxy *upower_proxy = NULL; - static GDBusProxy *ck_proxy = NULL; -+static GDBusProxy *login1_proxy = NULL; - - static gboolean - upower_call_function (const gchar *function, gboolean default_result, GError **error) -@@ -147,6 +148,59 @@ ck_call_function (const gchar *function, - return function_result; - } - -+static gboolean -+login1_call_function (const gchar *function, GVariant *parameters, gboolean default_result, GError **error) -+{ -+ GVariant *result; -+ gboolean function_result = FALSE; -+ const gchar *true_result = "yes"; -+ gchar *str_result; -+ -+ if (!login1_proxy) -+ { -+ login1_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, -+ G_DBUS_PROXY_FLAGS_NONE, -+ NULL, -+ "org.freedesktop.login1", -+ "/org/freedesktop/login1", -+ "org.freedesktop.login1.Manager", -+ NULL, -+ error); -+ if (!login1_proxy) -+ return FALSE; -+ } -+ -+ result = g_dbus_proxy_call_sync (login1_proxy, -+ function, -+ parameters, -+ G_DBUS_CALL_FLAGS_NONE, -+ -1, -+ NULL, -+ error); -+ -+ if (!result) -+ return default_result; -+ -+ if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(b)"))) -+ g_variant_get (result, "(s)", &function_result); -+ -+ /** -+ * CanReboot, CanPowerOff returns a string "yes", "no", or "challenge", not a boolean as ConsoleKit -+ **/ -+ if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(s)"))) { -+ g_variant_get (result, "(b)", str_result); -+ if(g_strcmp0(str_result,true_result) == 0) { -+ function_result = TRUE; -+ } -+ else { -+ function_result = default_result; -+ } -+ } -+ -+ g_variant_unref (result); -+ return function_result; -+} -+ - /** - * lightdm_get_can_restart: - * -@@ -157,7 +211,11 @@ ck_call_function (const gchar *function, - gboolean - lightdm_get_can_restart (void) - { -- return ck_call_function ("CanRestart", FALSE, NULL); -+ gboolean function_result = FALSE; -+ function_result = login1_call_function ("CanReboot", NULL, FALSE, NULL); -+ if (!function_result) -+ function_result = ck_call_function ("CanRestart", FALSE, NULL); -+ return function_result; - } - - /** -@@ -171,7 +229,11 @@ lightdm_get_can_restart (void) - gboolean - lightdm_restart (GError **error) - { -- return ck_call_function ("Restart", TRUE, error); -+ gboolean function_result = FALSE; -+ function_result = login1_call_function ("Reboot", g_variant_new("(b)",0), TRUE, error); -+ if (!function_result) -+ function_result = ck_call_function ("Restart", TRUE, error); -+ return function_result; - } - - /** -@@ -184,7 +246,11 @@ lightdm_restart (GError **error) - gboolean - lightdm_get_can_shutdown (void) - { -- return ck_call_function ("CanStop", FALSE, NULL); -+ gboolean function_result = FALSE; -+ function_result = login1_call_function ("CanPowerOff", NULL, FALSE, NULL); -+ if (!function_result) -+ function_result = ck_call_function ("CanStop", FALSE, NULL); -+ return function_result; - } - - /** -@@ -198,5 +264,9 @@ lightdm_get_can_shutdown (void) - gboolean - lightdm_shutdown (GError **error) - { -- return ck_call_function ("Stop", TRUE, error); -+ gboolean function_result = FALSE; -+ function_result = login1_call_function ("PowerOff", g_variant_new("(b)",0), TRUE, error); -+ if (!function_result) -+ function_result = ck_call_function ("Stop", TRUE, error); -+ return function_result; - } -diff -up lightdm-1.5.1/liblightdm-qt/power.cpp.systemd_login1_power lightdm-1.5.1/liblightdm-qt/power.cpp ---- lightdm-1.5.1/liblightdm-qt/power.cpp.systemd_login1_power 2013-03-05 20:40:10.000000000 -0600 -+++ lightdm-1.5.1/liblightdm-qt/power.cpp 2013-03-09 11:36:47.140559838 -0600 -@@ -15,6 +15,7 @@ - #include <QtCore/QVariant> - #include <QtDBus/QDBusInterface> - #include <QtDBus/QDBusReply> -+#include <QDebug> - - #include "config.h" - -@@ -26,11 +27,13 @@ public: - PowerInterfacePrivate(); - QScopedPointer<QDBusInterface> powerManagementInterface; - QScopedPointer<QDBusInterface> consoleKitInterface; -+ QScopedPointer<QDBusInterface> login1Interface; - }; - - PowerInterface::PowerInterfacePrivate::PowerInterfacePrivate() : - powerManagementInterface(new QDBusInterface("org.freedesktop.UPower","/org/freedesktop/UPower", "org.freedesktop.UPower", QDBusConnection::systemBus())), -- consoleKitInterface(new QDBusInterface("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", QDBusConnection::systemBus())) -+ consoleKitInterface(new QDBusInterface("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", QDBusConnection::systemBus())), -+ login1Interface(new QDBusInterface("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", QDBusConnection::systemBus())) - { - } - -@@ -80,34 +83,55 @@ void PowerInterface::hibernate() - - bool PowerInterface::canShutdown() - { -+ -+ if ( d->login1Interface->isValid() ) { -+ QDBusReply<QString> reply1 = d->login1Interface->call("CanPowerOff"); -+ if (reply1.isValid()) { -+ return (reply1.value()=="yes"); -+ } -+ } -+ qWarning() << d->login1Interface->lastError(); -+ - QDBusReply<bool> reply = d->consoleKitInterface->call("CanStop"); - if (reply.isValid()) { - return reply.value(); - } -- else { -- return false; -- } -+ -+ return false; - } - - void PowerInterface::shutdown() - { -- d->consoleKitInterface->call("Stop"); -+ if ( d->login1Interface->isValid() ) -+ d->login1Interface->call("PowerOff",false); -+ else -+ d->consoleKitInterface->call("Stop"); - } - - bool PowerInterface::canRestart() - { -+ if ( d->login1Interface->isValid() ) { -+ QDBusReply<QString> reply1 = d->login1Interface->call("CanReboot"); -+ if (reply1.isValid()) { -+ return (reply1.value()=="yes"); -+ } -+ } -+ qWarning() << d->login1Interface->lastError(); -+ - QDBusReply<bool> reply = d->consoleKitInterface->call("CanRestart"); - if (reply.isValid()) { - return reply.value(); - } -- else { -- return false; -- } -+ -+ return false; - } - - void PowerInterface::restart() - { -- d->consoleKitInterface->call("Restart"); -+ if ( d->login1Interface->isValid() ) -+ d->login1Interface->call("Reboot",false); -+ else -+ d->consoleKitInterface->call("Restart"); - } - - #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) diff --git a/community/meteorjs/PKGBUILD b/community/meteorjs/PKGBUILD index b64b79f01..ac731580e 100644 --- a/community/meteorjs/PKGBUILD +++ b/community/meteorjs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84695 2013-02-22 11:25:02Z mtorromeo $ +# $Id: PKGBUILD 86245 2013-03-14 08:59:11Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Parth Buch <parthbuch115 at gmail dot com> # Contributor: Tom Vincent <http://tlvince.com/contact/> pkgname=meteorjs -pkgver=0.5.7 +pkgver=0.5.8 pkgrel=1 pkgdesc="Open-source platform for building top-quality web apps in a fraction of the time." arch=('i686' 'x86_64') @@ -13,14 +13,14 @@ license=('MIT') depends=('nodejs' 'mongodb') options=('!strip') -sha256sums=('dea74135489b89d7a7fdebb3966a05b2df41440bbdc31adce85e6b140aff8e23' +sha256sums=('232d7a0bf0947e29fcd6ff8e7314d5783c1b4b7e5c6b5b68ed9ef2ed8d75c6cc' 'a3ac659c52b652676da0530f2148025e0f8bfa84bccf63431c20eb72d3bc5cb7') if [ "$CARCH" = "x86_64" ]; then _arch="amd64" else _arch="i386" - sha256sums[0]='2a126beb5224e4063c8efc849e099d7bf302f062e76356f8f7662737bccd41b6' + sha256sums[0]='b9c45ad56b2ccd2d6fa41740b20c671ea642ce84271474c319ddc8a67a0c77ff' fi source=("http://d3sqy0vbqsdhku.cloudfront.net/meteor_$pkgver-1_$_arch.deb" meteor) diff --git a/community/ogmrip/PKGBUILD b/community/ogmrip/PKGBUILD deleted file mode 100644 index 16f63a541..000000000 --- a/community/ogmrip/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 72064 2012-06-07 19:51:29Z jlichtblau $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Daenyth -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Vrob (Markus Heuser) mheuser@mi.fu-berlin.de - -pkgname=ogmrip -pkgver=0.13.8 -pkgrel=1 -pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder" -arch=('i686' 'x86_64' 'mips64el') -url="http://ogmrip.sourceforge.net/" -license=('GPL') -depends=('libdvdread>=4.1.3' 'mplayer' 'mencoder' 'enca' 'pkg-config' 'gconf' 'libglade' 'libnotify' 'enchant') -makedepends=('patch' 'intltool' 'perl-xml-parser' 'faac' 'lame' 'mkvtoolnix' 'libtheora' 'ogmtools' 'gpac' 'vorbis-tools' 'tesseract') -optdepends=('faac: support for the AAC audio codec' - 'lame: support for the MP3 audio codec' - 'mkvtoolnix: create, alter, and inspect Matroska files' - 'libtheora: decode and encode Ogg Theora files' - 'ogmtools: support for the Ogg Media container' - 'gpac: support for the MP4 container' - 'vorbis-tools: support for the Ogg Vorbis audio codec' - 'gocr: support for the SRT subtitle format' - 'ocrad: support for the SRT subtitle format' - 'tesseract: support for the SRT subtitle format') -options=('!libtool' '!makeflags') -changelog=$pkgname.changelog -install=$pkgname.install -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha256sums=('ea6a75e6cc4fe7df1ed65648af208c87748959a6b372847b1005c3b92cc5a423') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --sysconfdir=/usr/share - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/community/ogmrip/ogmrip.changelog b/community/ogmrip/ogmrip.changelog deleted file mode 100644 index da70a7631..000000000 --- a/community/ogmrip/ogmrip.changelog +++ /dev/null @@ -1,24 +0,0 @@ -2012-06-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * ogmrip O.13.8-1 - -2012-01-26 Eric Belanger <eric@archlinux.org> - * Rebuild against libpng 1.5 and libtiff 4.0 - * Add .install file - -2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * ogmrip O.13.7-1 - -2010-08-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * ogmrip O.13.6-1 - -2010-06-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release O.13.5 - -2010-04-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release O.13.4 - -2010-01-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * FS#17517 fixed in minor release O.13.3-2 - -2010-01-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release O.13.3 diff --git a/community/ogmrip/ogmrip.install b/community/ogmrip/ogmrip.install deleted file mode 100644 index 660593cf5..000000000 --- a/community/ogmrip/ogmrip.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community/oss/PKGBUILD b/community/oss/PKGBUILD index d799639c8..a6a55f677 100644 --- a/community/oss/PKGBUILD +++ b/community/oss/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 76238 2012-09-14 22:52:02Z kkeen $ +# $Id: PKGBUILD 86302 2013-03-14 21:30:53Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Florian Pritz <bluewind@xinu.at> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> @@ -8,7 +8,7 @@ pkgbase=oss pkgname=oss true && pkgname=(oss libflashsupport-oss) pkgver=4.2_2007 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://developer.opensound.com/" license=('GPL2') @@ -18,6 +18,7 @@ source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_ "rc-script" "soundon.patch" "remove-hal.patch" + "linux-3.8.patch" "oss.service" ) md5sums=('26b9d6951f3eb2eac39a0f42f0dbdae7' @@ -25,6 +26,7 @@ md5sums=('26b9d6951f3eb2eac39a0f42f0dbdae7' 'cbcbce5c03b127df5eafa8faa091492c' '65f07fe241bfbf912f76d8b6d8f276b5' 'cd7f1dc6166bba8c94d96f3a28e948a5' + 'effecefb774f1d08ef9f0af0ad205c34' '8db0255b380dc6672993e627d1cd8ca6') _dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl @@ -56,6 +58,10 @@ build() { sed -i 's|/lib/modules|/usr&|' \ os_cmd/Linux/ossvermagic/ossvermagic.c + pushd "$srcdir/$_dir" + patch -p0 -i "${srcdir}/linux-3.8.patch" + popd + msg "Building OSS." make build diff --git a/community/oss/linux-3.8.patch b/community/oss/linux-3.8.patch new file mode 100644 index 000000000..46200e01a --- /dev/null +++ b/community/oss/linux-3.8.patch @@ -0,0 +1,40 @@ +--- setup/Linux/oss/build/pci_wrapper.inc 2009-08-27 05:19:07.000000000 +0300 ++++ setup/Linux/oss/build/pci_wrapper.inc 2013-02-08 13:56:10.519794975 +0200 +@@ -17,7 +17,11 @@ + static dev_map_t dev_map[MAX_INSTANCE]; + static int n_devmap = 0; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) + static int __devinit ++#else ++static int ++#endif + osspci_probe (struct pci_dev *pcidev, const struct pci_device_id *pciid) + { + oss_device_t *osdev; +@@ -65,7 +69,11 @@ + return 0; + } + +-static void __devexit ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0) ++static int __devexit ++#else ++static int ++#endif + osspci_remove (struct pci_dev *pcidev) + { + int i; +@@ -80,10 +88,11 @@ + pci_disable_device (dev_map[i].pcidev); + osdev_delete (osdev); + +- return; ++ return 0; + } + + printk (KERN_ALERT DRIVER_NICK ": Can't find the PCI device to detach\n"); ++ return -EIO; + } + + void diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 7983075a7..893a2fd13 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84934 2013-02-26 10:19:55Z spupykin $ +# $Id: PKGBUILD 86289 2013-03-14 19:44:14Z dwallace $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: mpie <michael.kyne-phillips1@ntlworld.com> @@ -6,7 +6,7 @@ pkgname=parrot pkgver=5.1.0 #_rel=stable _rel=devel -pkgrel=2 +pkgrel=3 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages" arch=('x86_64' 'i686' 'mips64el') url="http://www.parrotcode.org/" @@ -23,6 +23,7 @@ build() { perl Configure.pl --prefix=/usr \ --parrot_is_shared \ --disable-rpath \ + --mandir=/usr/share/man \ --optimize export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(pwd)/blib/lib" make all parrot_utils docs html diff --git a/community/python-pycuda/PKGBUILD b/community/python-pycuda/PKGBUILD deleted file mode 100644 index e1f2c2c5a..000000000 --- a/community/python-pycuda/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 83271 2013-01-28 16:50:02Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -pkgbase=python-pycuda -pkgname=('python-pycuda' 'python2-pycuda' 'pycuda-headers') -pkgver=2012.1 -pkgrel=2 -pkgdesc="Python wrapper for Nvidia CUDA" -arch=('i686' 'x86_64') -url="http://mathema.tician.de/software/pycuda" -license=('MIT') -source=(http://pypi.python.org/packages/source/p/pycuda/pycuda-${pkgver}.tar.gz) -makedepends=('ctags' 'python2-distribute' 'python-distribute' 'python2-numpy' 'python-numpy' 'mesa' 'cuda' 'boost>=1.52.0' 'nvidia-utils') -sha1sums=('dd52ee697ae9f6256efac3bca682be9c6e7c9649') - -build() { - cd "${srcdir}" - - _arch='' - [ "$CARCH" = "x86_64" ] && _arch='64' - - cp -a pycuda-${pkgver}{,-python2} - - cd "${srcdir}"/pycuda-${pkgver} - python3 ./configure.py \ - --cuda-root=/opt/cuda \ - --cuda-inc-dir=/opt/cuda/include \ - --cudadrv-lib-dir=/opt/cuda/lib${_arch} \ - --cudart-lib-dir=/opt/cuda/lib${_arch} \ - --no-use-shipped-boost \ - --boost-python-libname=boost_python3 - make - - cd "${srcdir}"/pycuda-${pkgver}-python2 - python2 ./configure.py \ - --cuda-root=/opt/cuda \ - --cuda-inc-dir=/opt/cuda/include \ - --cudadrv-lib-dir=/opt/cuda/lib${_arch} \ - --cudart-lib-dir=/opt/cuda/lib${_arch} \ - --no-use-shipped-boost - make -} - -package_python-pycuda() { - depends=('cuda' 'nvidia-utils' 'python-numpy' 'python-pytools' 'python' 'boost-libs' 'pycuda-headers') - cd "${srcdir}"/pycuda-${pkgver} - python3 setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=1 - - rm -fr "${pkgdir}"/usr/include -} - -package_python2-pycuda() { - depends=('cuda' 'nvidia-utils' 'python2-numpy' 'python2-pytools' 'python2' 'boost-libs' 'pycuda-headers') - cd "${srcdir}"/pycuda-${pkgver}-python2 - python2 setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=1 - - rm -fr "${pkgdir}"/usr/include -} - -package_pycuda-headers() { - cd "${srcdir}"/pycuda-${pkgver} - install -dm755 "${pkgdir}"/usr/include/pycuda - - for file in $(ls -1 src/cuda/*.hpp); do - install -m644 ${file} "${pkgdir}"/usr/include/pycuda - done -} diff --git a/community/ruby-gtk2/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch b/community/ruby-gtk2/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch new file mode 100644 index 000000000..6e0088ea4 --- /dev/null +++ b/community/ruby-gtk2/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch @@ -0,0 +1,55 @@ +From 5b083ff67f69a8ab6fc6732131954482b468a880 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Sun, 10 Mar 2013 08:51:02 -0700 +Subject: [PATCH] backport + https://github.com/ruby-gnome2/ruby-gnome2/commit/03be2d663730119036c9d70d4fc7b52523ae40df + to fix syntax errors with NIL_P + +--- + gtk2/ext/gtk2/rbgdkevent.c | 2 +- + gtk2/ext/gtk2/rbgdkscreen.c | 2 +- + gtk2/ext/gtk2/rbgtkcalendar.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gtk2/ext/gtk2/rbgdkevent.c b/gtk2/ext/gtk2/rbgdkevent.c +index 783ec72..63b1502 100644 +--- a/gtk2/ext/gtk2/rbgdkevent.c ++++ b/gtk2/ext/gtk2/rbgdkevent.c +@@ -387,7 +387,7 @@ gdkevent_s_setting_get(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self) + VALUE value; + + rb_scan_args(argc, argv, "11", &name, &type); +- if NIL_P(type) ++ if (NIL_P(type)) + gtype = G_TYPE_STRING; + else + gtype = CLASS2GTYPE(type); +diff --git a/gtk2/ext/gtk2/rbgdkscreen.c b/gtk2/ext/gtk2/rbgdkscreen.c +index 243ed92..3095e38 100644 +--- a/gtk2/ext/gtk2/rbgdkscreen.c ++++ b/gtk2/ext/gtk2/rbgdkscreen.c +@@ -210,7 +210,7 @@ rg_get_setting(int argc, VALUE *argv, VALUE self) + VALUE value; + + rb_scan_args(argc, argv, "11", &name, &type); +- if NIL_P(type) ++ if (NIL_P(type)) + gtype = G_TYPE_STRING; + else + gtype = CLASS2GTYPE(type); +diff --git a/gtk2/ext/gtk2/rbgtkcalendar.c b/gtk2/ext/gtk2/rbgtkcalendar.c +index e895f81..f9b0666 100644 +--- a/gtk2/ext/gtk2/rbgtkcalendar.c ++++ b/gtk2/ext/gtk2/rbgtkcalendar.c +@@ -105,7 +105,7 @@ rg_display_options(int argc, VALUE *argv, VALUE self) + VALUE flags; + rb_scan_args(argc, argv, "01", &flags); + +- if NIL_P(flags){ ++ if (NIL_P(flags)){ + #if GTK_CHECK_VERSION(2,4,0) + return GFLAGS2RVAL(gtk_calendar_get_display_options(_SELF(self)), + GTK_TYPE_CALENDAR_DISPLAY_OPTIONS); +-- +1.8.1.5 + diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD index e49f1ac73..4be4eb028 100644 --- a/community/ruby-gtk2/PKGBUILD +++ b/community/ruby-gtk2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83903 2013-02-06 13:56:53Z arodseth $ +# $Id: PKGBUILD 86266 2013-03-14 14:33:19Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger <eric@archlinux.org> # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -8,23 +8,32 @@ pkgbase=ruby-gtk2 pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2' 'ruby-pango') -pkgver=1.2.1 -pkgrel=2 +pkgver=1.2.2 +pkgrel=1 arch=('x86_64' 'i686' 'mips64el') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') -makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2') -options=('!makeflags') -source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz") -sha256sums=('cb6e329f64042c8d24248204e11bb4652f9b2984ac2965d82dab49634deb1125') +makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2') +source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz" + '0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch') +sha256sums=('f99ff4888fc69317e1dae61c9ca684bf2f38a20534f1f1b4b3b182c66247910c' + '9180b6b8d146b815de63bd2c4f0e215ab7591e3ebaca913120ae962695f3c388') build() { cd "$srcdir/ruby-gtk2-$pkgver" + + #patch -Np1 -i ${srcdir}/0001-backport-https-github.com-ruby-gnome2-ruby-gnome2-co.patch LANG="en_US.UTF-8" \ ruby extconf.rb atk gdk_pixbuf2 gio2 glib2 gtk2 pango --vendor - #mkdir -p \ - # "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/site_ruby/1.9.1/i686-linux" - make -j1 + #mkdir -p "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/site_ruby/2.0.0/i686-linux" + #mkdir -p "$pkgdir/ruby-gio2/usr/lib/ruby/site_ruby/2.0.0/x86_64-linux" + mkdir -p "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/1.9.1/i686-linux" + mkdir -p "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/1.9.1/i686-linux" + mkdir -p "$pkgdir/ruby-gio2/usr/lib/ruby/site_ruby/1.9.1/i686-linux" + mkdir -p "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/site_ruby/1.9.1/i686-linux" + #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" + #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" + make } package_ruby-atk() { @@ -32,7 +41,9 @@ package_ruby-atk() { depends=("ruby-glib2=$pkgver" 'atk') cd "$srcdir/ruby-gtk2-$pkgver/atk" - make DESTDIR="$pkgdir/" install + #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" + #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" + make includedir="/usr/include" DESTDIR="$pkgdir" install } package_ruby-gdkpixbuf2() { @@ -40,7 +51,9 @@ package_ruby-gdkpixbuf2() { depends=("ruby-glib2=$pkgver" 'gdk-pixbuf2') cd "$srcdir/ruby-gtk2-$pkgver/gdk_pixbuf2" - make DESTDIR="$pkgdir/" install + #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" + #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" + make includedir="/usr/include" DESTDIR="$pkgdir" install } package_ruby-gio2() { @@ -48,7 +61,9 @@ package_ruby-gio2() { depends=("ruby-glib2=$pkgver") cd "$srcdir/ruby-gtk2-$pkgver/gio2" - make DESTDIR="$pkgdir/" install + #export CXXFLAGS="$CXXFLAGS -lglib-2.0" + #export CFLAGS="$CFLAGS -lglib-2.0" + make includedir="/usr/include" DESTDIR="$pkgdir/" install } package_ruby-glib2() { @@ -56,7 +71,9 @@ package_ruby-glib2() { depends=('glib2' 'ruby') cd "$srcdir/ruby-gtk2-$pkgver/glib2" - make DESTDIR="$pkgdir/" install + #export CXXFLAGS="$CXXFLAGS -lglib-2.0" + #export CFLAGS="$CFLAGS -lglib-2.0" + make includedir="/usr/include" DESTDIR="$pkgdir/" install } package_ruby-gtk2() { @@ -65,7 +82,9 @@ package_ruby-gtk2() { "ruby-gdkpixbuf2=$pkgver") cd "$srcdir/ruby-gtk2-$pkgver/gtk2" - make DESTDIR="$pkgdir/" install + #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" + #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" + make includedir="/usr/include" DESTDIR="$pkgdir/" install } package_ruby-pango() { @@ -73,7 +92,9 @@ package_ruby-pango() { depends=("ruby-glib2=$pkgver" 'ruby-cairo' 'pango') cd "$srcdir/ruby-gtk2-$pkgver/pango" - make DESTDIR="$pkgdir/" install + #export CFLAGS="$CFLAGS `pkg-config --libs glib-2.0`" + #export CXXFLAGS="$CXXFLAGS `pkg-config --libs glib-2.0`" + make includedir="/usr/include" DESTDIR="$pkgdir/" install } # vim:set ts=2 sw=2 et: diff --git a/community/ruby-gtk3/0001-backport-fix-for-syntax-error-https-github.com-ruby.patch b/community/ruby-gtk3/0001-backport-fix-for-syntax-error-https-github.com-ruby.patch new file mode 100644 index 000000000..d84107f0c --- /dev/null +++ b/community/ruby-gtk3/0001-backport-fix-for-syntax-error-https-github.com-ruby.patch @@ -0,0 +1,40 @@ +From c0d6f9ad4ab23dc980746078a127905ea56c9bf1 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Sun, 10 Mar 2013 09:39:45 -0700 +Subject: [PATCH] backport fix for syntax error + https://github.com/ruby-gnome2/ruby-gnome2/commit/03be2d663730119036c9d70d4fc7b52523ae40df + +--- + gdk3/ext/gdk3/rbgdkevent.c | 2 +- + gdk3/ext/gdk3/rbgdkscreen.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gdk3/ext/gdk3/rbgdkevent.c b/gdk3/ext/gdk3/rbgdkevent.c +index 62bb35d..a5478a6 100644 +--- a/gdk3/ext/gdk3/rbgdkevent.c ++++ b/gdk3/ext/gdk3/rbgdkevent.c +@@ -370,7 +370,7 @@ gdkevent_s_setting_get(int argc, VALUE *argv, G_GNUC_UNUSED VALUE self) + VALUE value; + + rb_scan_args(argc, argv, "11", &name, &type); +- if NIL_P(type) ++ if (NIL_P(type)) + gtype = G_TYPE_STRING; + else + gtype = CLASS2GTYPE(type); +diff --git a/gdk3/ext/gdk3/rbgdkscreen.c b/gdk3/ext/gdk3/rbgdkscreen.c +index 8f5bffb..7439ad1 100644 +--- a/gdk3/ext/gdk3/rbgdkscreen.c ++++ b/gdk3/ext/gdk3/rbgdkscreen.c +@@ -214,7 +214,7 @@ rg_get_setting(int argc, VALUE *argv, VALUE self) + VALUE value; + + rb_scan_args(argc, argv, "11", &name, &type); +- if NIL_P(type) ++ if (NIL_P(type)) + gtype = G_TYPE_STRING; + else + gtype = CLASS2GTYPE(type); +-- +1.8.1.5 + diff --git a/community/ruby-gtk3/PKGBUILD b/community/ruby-gtk3/PKGBUILD index df5a1497e..955fb4412 100644 --- a/community/ruby-gtk3/PKGBUILD +++ b/community/ruby-gtk3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85910 2013-03-08 21:51:38Z arodseth $ +# $Id: PKGBUILD 86274 2013-03-14 15:41:22Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Eric Bélanger # Contributor: Brad Fanella <bradfanella@archlinux.us> @@ -8,17 +8,22 @@ pkgbase=ruby-gtk3 pkgname=('ruby-gtk3' 'ruby-gdk3') depends=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-glib2' 'ruby-pango') -pkgver=1.2.1 -pkgrel=3 +pkgver=1.2.2 +pkgrel=1 arch=('x86_64' 'i686') url='http://ruby-gnome2.sourceforge.jp/' license=('LGPL') makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk3') -source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk3-$pkgver.tar.gz") -sha256sums=('78c7dbfaebabefe0f5a3d96c779cc08ea949a354e3f7cd1ff797d850ded4168a') +source=("http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk3-$pkgver.tar.gz" + '0001-backport-fix-for-syntax-error-https-github.com-ruby.patch') +sha256sums=('1dd73c4aa184199f373edad589b715b68da8eb43ae6bdae360e0aa62189a681d' + '0df3571688a18048fac9211df1bf21effd4120e568b34e523fe50a7a63e3e3d6') build() { cd "$srcdir/ruby-gtk3-$pkgver" + + #patch -Np1 -i \ + # "$srcdir/0001-backport-fix-for-syntax-error-https-github.com-ruby.patch" LANG="en_US.UTF-8" ruby extconf.rb gtk3 gdk3 --vendor make } @@ -37,7 +42,7 @@ package_ruby-gdk3() { depends=('ruby' 'gtk3') cd "$srcdir/ruby-gtk3-$pkgver/gdk3" - [ $CARCH == 'i686' ] && mkdir -p /usr/lib/ruby/vendor_ruby/1.9.1/i686-linux + [ $CARCH == 'i686' ] && mkdir -p /usr/lib/ruby/vendor_ruby/2.0.0/i686-linux make DESTDIR="$pkgdir/" install } diff --git a/community/soundkonverter/PKGBUILD b/community/soundkonverter/PKGBUILD deleted file mode 100644 index 58e52c92a..000000000 --- a/community/soundkonverter/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 86067 2013-03-11 21:28:00Z stativ $ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor: Mateusz Herych <heniekk@gmail.com> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Darwin Bautista <djclue917@gmail.com> - -pkgname=soundkonverter -pkgver=2.0.0 -pkgrel=1 -pkgdesc="Front-end to various audio converters" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.kde-apps.org/content/show.php?content=29024" -license=('GPL') -depends=('kdebase-runtime' 'libkcddb' 'cdparanoia' 'taglib') -makedepends=('automoc4' 'cmake') -optdepends=('cdrkit: cdda2wav backend' - 'faac: faac backend' - 'faad2: faad backend' - 'ffmpeg: ffmpeg backend' - 'flac: flac backend' - 'fluidsynth: flouidsynth backend' - 'lame: lame backend' - 'mac: mac backend' - 'mplayer: mplayer backend' - 'mp3gain: mp3gain backend' - 'opus-tools: opus backend' - 'speex: speexenc, speexdec backends' - 'timidity++: midi backend' - 'twolame: twolame backend' - 'vorbisgain: vorbisgain backend' - 'vorbis-tools: vorbis tools backend' - 'wavpack: wavpack backend' - 'sox: sox plugin (change sample rate, various effects)') -install=$pkgname.install -source=("http://kde-apps.org/CONTENT/content-files/29024-${pkgname}-${pkgver}.tar.gz") -md5sums=('f1df729916b2418c474b859ed6b9eda6') - -build() { - cd "$srcdir"/$pkgname-$pkgver - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/community/soundkonverter/soundkonverter.install b/community/soundkonverter/soundkonverter.install deleted file mode 100644 index 0e8feb79c..000000000 --- a/community/soundkonverter/soundkonverter.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD index 3db52df43..3ada53a2a 100644 --- a/community/spring/PKGBUILD +++ b/community/spring/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85914 2013-03-08 23:19:52Z svenstaro $ +# $Id: PKGBUILD 86298 2013-03-14 20:56:19Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=spring -pkgver=0.93.0 -_pkgver=93.0 +pkgver=0.93.2 +_pkgver=93.2 pkgrel=1 pkgdesc='A free 3D real-time-strategy (RTS) game engine' arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ optdepends=('python2: python-based bots' 'java-runtime: java-based bots') install=spring.install source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma) -md5sums=('770b2f1aefddb9752d3a5bb70ba76cca') +md5sums=('f6e1cb11d9254aca38731995c29303ba') build() { bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD index 1242a98aa..c5252d4ea 100644 --- a/community/unbound/PKGBUILD +++ b/community/unbound/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 81233 2012-12-13 22:22:41Z bisson $ +# $Id: PKGBUILD 86306 2013-03-14 22:48:33Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=unbound pkgver=1.4.19 -pkgrel=1 +pkgrel=2 pkgdesc='Validating, recursive, and caching DNS resolver' url='http://unbound.net/' license=('custom:BSD') @@ -20,7 +20,7 @@ source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz" 'unbound.conf' 'rc.d') sha1sums=('ccf0d465fc0045d59ceca11ecde688edebd28ec1' - '5bc313cd978e4d6efe8c13600e838c70629be477' + 'a2493cb105ff6aa23d756514badb13b02d37f319' '5d473ec2943fd85367cdb653fcd58e186f07383f' 'dc96e772f467b32555df21d16fdb15e98194c228') diff --git a/community/unbound/unbound.service b/community/unbound/unbound.service index 8b3c9576b..8e59e5a6a 100644 --- a/community/unbound/unbound.service +++ b/community/unbound/unbound.service @@ -1,5 +1,6 @@ [Unit] Description=Unbound DNS Resolver +After=network.target [Service] PIDFile=/run/unbound.pid diff --git a/community/virtualgl/PKGBUILD b/community/virtualgl/PKGBUILD new file mode 100644 index 000000000..87dcb047b --- /dev/null +++ b/community/virtualgl/PKGBUILD @@ -0,0 +1,36 @@ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: FigoDaPaura <ffigoDaPaura> +# Contributor: Andres Jimenez + +pkgname=virtualgl +pkgver=2.3.2 +pkgrel=2 +pkgdesc="Redirects 3D commands from an OpenGL application onto a server-side 3D graphics card" +arch=('i686' 'x86_64') +url="http://virtualgl.org" +license=('LGPL') +depends=('libxv' 'glu' 'turbojpeg') +makedepends=('cmake' 'mesa') +source=("http://downloads.sourceforge.net/project/virtualgl/VirtualGL/$pkgver/VirtualGL-$pkgver.tar.gz") +sha1sums=('f042862c21ceaba57c6e1f0ec72adb4f838725e9') + +build() { + cd "$srcdir/VirtualGL-$pkgver" + + mkdir -p build && cd build + + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr/share \ + -DTJPEG_INCLUDE_DIR=/usr/include \ + -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so \ + -DVGL_LIBDIR=/usr/lib \ + -DVGL_BINDIR=/usr/bin + make +} + +package() { + cd "$srcdir/VirtualGL-$pkgver/build" + make install DESTDIR="$pkgdir" + + mv "$pkgdir"/usr/bin/glxinfo "$pkgdir"/usr/bin/vglxinfo +} diff --git a/community/xbmc-pvr-addons/PKGBUILD b/community/xbmc-pvr-addons/PKGBUILD new file mode 100644 index 000000000..0e867b56c --- /dev/null +++ b/community/xbmc-pvr-addons/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 86252 2013-03-14 11:10:40Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=xbmc-pvr-addons +pkgver=12.0_Frodo +pkgrel=1 +pkgdesc="XBMC PVR add-ons for current stable xbmc" +arch=('i686' 'x86_64') +url="https://github.com/opdenkamp/xbmc-pvr-addons" +license=('GPL3') +depends=('xbmc' 'libmysqlclient') +makedepends=('git' 'libmysqlclient' 'boost') +optdepends=('tvheadend-git: tvheadend backend' 'mythtv: mythtv backend') +conflicts=('xbmc-pvr-addons-git') +source=("$pkgname-$pkgver.tar.gz::https://github.com/opdenkamp/xbmc-pvr-addons/archive/${pkgver/_/-}.tar.gz") +md5sums=('4411848a648597037daf97562dd0fcd2') + +build() { + cd "$srcdir/$pkgname-${pkgver/_/-}" + ./bootstrap + ./configure --prefix=/usr --enable-addons-with-dependencies + make +} + +package() { + cd "$srcdir/$pkgname-${pkgver/_/-}" + make DESTDIR="$pkgdir/" install +} diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index f2bbab89d..26f4be43c 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178093 2013-02-16 07:50:45Z ronald $ +# $Id: PKGBUILD 180027 2013-03-14 20:45:46Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 -pkgver=3.7.0 +pkgver=3.8.0 pkgrel=1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_pro 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz iproute2-fhs.patch) -sha1sums=('9b45ede534fd49d2ec5a7fe0f69e1926ef767a76' +sha1sums=('6d40dd2b91aad9ae084c99973dcdfdbf6fb353fc' '35b8cf2dc94b73eccad427235c07596146cd6f6c') build() { diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD index f3345c08e..e852b87fa 100644 --- a/core/iptables/PKGBUILD +++ b/core/iptables/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 174851 2013-01-07 21:57:24Z ronald $ +# $Id: PKGBUILD 180028 2013-03-14 20:45:48Z foutrelis $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> pkgname=iptables -pkgver=1.4.16.3 +pkgver=1.4.18 pkgrel=1 pkgdesc='Linux kernel packet control tool' arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url='http://www.netfilter.org/projects/iptables/index.html' depends=('glibc' 'bash') -makedepends=('linux-api-headers') +makedepends=('linux-api-headers' 'chrpath') options=('!libtool') -source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2" +source=("http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2" iptables ip6tables empty.rules @@ -28,7 +28,7 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta ip6tables.service iptables-flush) backup=(etc/conf.d/iptables) -sha1sums=('819949fdf4276a04c5061b82898b515f139b0117' +sha1sums=('34bf627c8755a61caf3635a998d2a5279f664f9e' '5bb6fa526665cdd728c26f0f282f5a51f220cf88' '2db68906b603e5268736f48c8e251f3a49da1d75' '83b3363878e3660ce23b2ad325b53cbd6c796ecf' @@ -52,14 +52,10 @@ build() { patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch - [ "$CARCH" = "mips64el" ] || extra="--enable-libipq" - ./configure --prefix=/usr \ --libexecdir=/usr/lib/iptables --sysconfdir=/etc \ --with-xtlibdir=/usr/lib/iptables \ - --enable-devel $extra \ - --enable-shared - + --enable-devel --enable-shared make } @@ -68,6 +64,10 @@ package() { make DESTDIR="${pkgdir}" install + # Remove RPATH from iptables libraries + # http://www.spinics.net/lists/netfilter-devel/msg24969.html + chrpath --delete "${pkgdir}"/usr/lib/iptables/*.so + cd "${srcdir}" install -D -m755 iptables "${pkgdir}"/etc/rc.d/iptables install -D -m755 ip6tables "${pkgdir}"/etc/rc.d/ip6tables diff --git a/core/libffi/PKGBUILD b/core/libffi/PKGBUILD index 5e0b4b4d1..50059763b 100644 --- a/core/libffi/PKGBUILD +++ b/core/libffi/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 157383 2012-04-28 09:25:57Z allan $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 180006 2013-03-14 11:52:23Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Jan de Groot <jgc@archlinux.org> pkgname=libffi -pkgver=3.0.11 -pkgrel=1.1 +pkgver=3.0.12 +pkgrel=1 pkgdesc="A portable, high level programming interface to various calling conventions" arch=('i686' 'x86_64' 'mips64el') -url="http://sourceware.org/libffi" +url="http://sourceware.org/libffi/" license=('MIT') depends=('glibc') checkdepends=('dejagnu') options=('!libtool') install=libffi.install source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz) -md5sums=('f69b9693227d976835b4857b1ba7d0e3') +sha1sums=('463dcb4ae9aea4c52bba12b67fbe4d91ed1e21fd') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } @@ -29,5 +30,5 @@ check() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index e56975f0c..86da83dcc 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166755 2012-09-18 13:55:25Z bisson $ +# $Id: PKGBUILD 180031 2013-03-14 21:45:11Z bisson $ # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=clamav -pkgver=0.97.6 -pkgrel=1.1 +pkgver=0.97.7 +pkgrel=1 pkgdesc='Anti-virus toolkit for Unix' url='http://www.clamav.net/' license=('GPL') @@ -21,7 +21,7 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver 'logrotate' 'tmpfiles.d' 'config.patch') -sha1sums=('528f774b14b95fdfb8b377f8b41859c48b165e34' +sha1sums=('9b911c557e0b7b5079de86c65b5d83fa78fadfff' 'c9d508c1e5972f0f849d8694c1872455fa9e74de' 'cb116cdab49a810381a515cbcfb6a6c148547f07' 'df522b0488f3901e491f148c9300f6bae348c605' diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD index 7de28e2b6..378680333 100644 --- a/extra/digikam/PKGBUILD +++ b/extra/digikam/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 177788 2013-02-08 18:59:53Z andrea $ +# $Id: PKGBUILD 180024 2013-03-14 20:15:45Z andrea $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=digikam pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki') -pkgver=3.0.0 -pkgrel=2 +pkgver=3.1.0 +pkgrel=1 pkgdesc="Digital photo management application for KDE" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.digikam.org/" makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr' 'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' - 'cmake' 'automoc4' 'doxygen' 'mesa' 'lensfun') + 'cmake' 'automoc4' 'doxygen' 'lensfun') source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('45a9490b2b10b7b42fa9f90b7389eeb248326718') +sha1sums=('f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd') build() { mkdir build @@ -24,7 +24,8 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ - -DBUILD_tests=OFF + -DBUILD_tests=OFF \ + -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF make } diff --git a/extra/ecasound/PKGBUILD b/extra/ecasound/PKGBUILD deleted file mode 100644 index d164f6b1b..000000000 --- a/extra/ecasound/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 168410 2012-10-11 09:44:14Z schiv $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=ecasound -pkgver=2.9.0 -pkgrel=1.1 -pkgdesc="A software package designed for multitrack audio processing" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.eca.cx/ecasound/" -license=('GPL' 'LGPL') -depends=('audiofile' 'liblo' - 'liboil' 'lilv') -makedepends=('python2' 'ruby') -optdepends=('python2: ecamonitor, ECI API' - 'ruby: ECI API' - 'mpg123: MP3 decoding' - 'lame: MP3 encoding' - 'vorbis-tools: Ogg Vorbis decoding/encoding' - 'faad2: AAC decoding' - 'faac: AAC encoding' - 'timidity++: MIDI file input' - 'libmikmod: tracker module') -options=('!libtool') -source=(http://ecasound.seul.org/download/$pkgname-$pkgver.tar.gz) -md5sums=('05e7d4664cdf4c7a138c098e9506a551') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # use vendor_ruby for ruby files - sed -e 's/CONFIG\["sitedir"\]/CONFIG\["vendordir"\]/' -i configure - - PYTHONPATH=/usr/bin/python2 ./configure \ - --prefix=/usr \ - --with-python-includes=/usr/include/python2.7 \ - --with-python-modules=/usr/lib/python2.7 - - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - - # fix for python 2.7 - sed -i 's:bin/env python:bin/env python2:' \ - "$pkgdir/usr/bin/ecamonitor" -} - -# vim:set ts=2 sw=2 et: diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index d093fd088..77eb99a84 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179046 2013-03-01 22:51:09Z dan $ +# $Id: PKGBUILD 179999 2013-03-14 02:05:50Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.1.5 +pkgver=1.8.2 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -82,7 +82,11 @@ package() { sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \ $(find "$pkgdir" -name '*.py') \ "$pkgdir"/usr/lib/git-core/git-p4 \ - "$pkgdir"/usr/share/git/gitview/gitview + "$pkgdir"/usr/share/git/gitview/gitview \ + "$pkgdir"/usr/share/git/remote-helpers/git-remote-bzr \ + "$pkgdir"/usr/share/git/remote-helpers/git-remote-hg + sed -i 's|#![ ]*/usr/bin/python|#!/usr/bin/python2|' \ + "$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py # emacs interface cd contrib/emacs @@ -103,7 +107,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('ce168861c23a700b40ffe94475bb1d9e' - '3ea0d73b2fa09558454279aad9039a3b' +md5sums=('210834d73c857931c3da34a65eb3e597' + '425e9421a1b128cfb46fa46d94cad919' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/glamor-egl/PKGBUILD b/extra/glamor-egl/PKGBUILD index 579f97b42..002ae2ace 100644 --- a/extra/glamor-egl/PKGBUILD +++ b/extra/glamor-egl/PKGBUILD @@ -4,7 +4,7 @@ pkgname=glamor-egl pkgver=0.5.0 -pkgrel=2 +pkgrel=3 pkgdesc='OpenGL based 2D rendering acceleration library ' arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -40,10 +40,11 @@ build() { ./configure --prefix=/usr \ --disable-static \ - --enable-glamor-gles2 \ --enable-glx-tls \ - #--help + + #--help + #--enable-glamor-gles2 \ https://bugs.archlinux.org/task/34284 make } diff --git a/extra/libdvdcss/PKGBUILD b/extra/libdvdcss/PKGBUILD index bec7d2a35..41146c232 100644 --- a/extra/libdvdcss/PKGBUILD +++ b/extra/libdvdcss/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 160018 2012-05-28 02:15:20Z eric $ +# $Id: PKGBUILD 180007 2013-03-14 11:52:25Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: arjan <arjan@archlinux.org> # Contributor Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=libdvdcss -pkgver=1.2.12 +pkgver=1.2.13 pkgrel=1 pkgdesc="A portable abstraction library for DVD decryption" url="http://www.videolan.org/libdvdcss" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('glibc') -options=('!libtool') +options=('!libtool' '!docs' '!emptydirs') source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2218a193900e3203aa10dc24cdf54275') +sha1sums=('1a4a5e55c7529da46386c1c333340eee2c325a77') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -23,5 +23,5 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD index 35f3dea7a..87254eccb 100644 --- a/extra/mariadb/PKGBUILD +++ b/extra/mariadb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 179729 2013-03-09 15:29:21Z bpiotrowski $ +# $Id: PKGBUILD 180012 2013-03-14 18:21:32Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> pkgbase=mariadb pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb') -pkgver=5.5.29 -pkgrel=6 +pkgver=5.5.30 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url='http://mariadb.org/' @@ -14,7 +14,7 @@ source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunt mariadb.service mariadb-post.sh mariadb-tmpfile.conf) -sha256sums=('b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74' +sha256sums=('64dba5f1819f1d4ebf7ed31d74e4106c981a24b88259995deba3734fb7c4635f' 'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334' '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd' '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd') diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index ea074d552..ff38eff10 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 178616 2013-02-25 20:44:59Z andyrtr $ +# $Id: PKGBUILD 180010 2013-03-14 16:21:55Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('mesa' 'mesa-libgl') pkgver=9.1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' 'wayland') @@ -18,8 +18,10 @@ license=('custom') options=('!libtool') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 #ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # for RC testing + git-fixes.patch LICENSE) md5sums=('d3891e02215422e120271d976ff1947e' + 'c3e45fe7287bbf8f620c209a872330dc' '5c65a0fe315dd347e09b1f2826a1df5a') build() { @@ -31,7 +33,10 @@ build() { extraconf="" fi -# patch -Np1 -i ${srcdir}/git_fixes.diff + # pick 2 commits from master to + # fix a nouveau crash: http://cgit.freedesktop.org/mesa/mesa/commit/?id=17f1cb1d99e66227d1e05925ef937643f5c1089a + # and intel kwin slowness http://cgit.freedesktop.org/mesa/mesa/commit/?id=e062a4187d8ea518a39c913ae7562cf1d8ac3205 + patch -Np1 -i ${srcdir}/git-fixes.patch autoreconf -vfi # our automake is far too new for their build system :) diff --git a/extra/mesa/git-fixes.patch b/extra/mesa/git-fixes.patch new file mode 100644 index 000000000..84efe610e --- /dev/null +++ b/extra/mesa/git-fixes.patch @@ -0,0 +1,52 @@ +From 17f1cb1d99e66227d1e05925ef937643f5c1089a Mon Sep 17 00:00:00 2001 +From: Jan de Groot <jan@jgc.homeip.net> +Date: Thu, 07 Mar 2013 18:48:13 +0000 +Subject: dri/nouveau: fix crash in nouveau_flush + +https://bugs.freedesktop.org/show_bug.cgi?id=61947 + +Note: this is a candidate for the stable branches +--- +diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.c b/src/mesa/drivers/dri/nouveau/nouveau_driver.c +index f56b3b2..6c119d5 100644 +--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.c ++++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.c +@@ -69,7 +69,8 @@ nouveau_flush(struct gl_context *ctx) + __DRIdri2LoaderExtension *dri2 = screen->dri2.loader; + __DRIdrawable *drawable = nctx->dri_context->driDrawablePriv; + +- dri2->flushFrontBuffer(drawable, drawable->loaderPrivate); ++ if (drawable && drawable->loaderPrivate) ++ dri2->flushFrontBuffer(drawable, drawable->loaderPrivate); + } + } + +-- +cgit v0.9.0.2-2-gbebe +From e062a4187d8ea518a39c913ae7562cf1d8ac3205 Mon Sep 17 00:00:00 2001 +From: Tapani Pälli <tapani.palli@intel.com> +Date: Mon, 28 Jan 2013 06:53:56 +0000 +Subject: intel: Fix regression in intel_create_image_from_name stride handling + +Strangely, the DRIimage interface we have passes the pitch in pixels +instead of bytes, which anholt missed in the change to using bytes for +region pitch. + +Signed-off-by: Tapani Pälli <tapani.palli@intel.com> +Reviewed-by: Eric Anholt <eric@anholt.net> +--- +diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c +index defcd73..d223a0b 100644 +--- a/src/mesa/drivers/dri/intel/intel_screen.c ++++ b/src/mesa/drivers/dri/intel/intel_screen.c +@@ -377,7 +377,7 @@ intel_create_image_from_name(__DRIscreen *screen, + cpp = _mesa_get_format_bytes(image->format); + image->region = intel_region_alloc_for_handle(intelScreen, + cpp, width, height, +- pitch, name, "image"); ++ pitch * cpp, name, "image"); + if (image->region == NULL) { + free(image); + return NULL; +-- +cgit v0.9.0.2-2-gbebe diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index eb684f5f7..eac7300d4 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 176062 2013-01-27 07:33:21Z allan $ +# $Id: PKGBUILD 180021 2013-03-14 19:23:11Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=filesystem -pkgver=2013.01 -pkgrel=3 -pkgdesc='Base filesystem for Parabola' +pkgver=2013.03 +pkgrel=2 +pkgdesc='Base filesystem (Parabola rebranded)' arch=('i686' 'x86_64' 'mips64el') license=('GPL') url='https://parabolagnulinux.org' @@ -20,7 +20,27 @@ backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf' 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt' - 'locale.sh') + 'locale.sh') +md5sums=('7b8e40f8f793e60f471511641bb1c9f2' + '6be47d893fd49b2e4a8c0e811b350861' + '9e4533df61f0c82d6b2e2371f7376282' + '4c4540eeb748bf1f71d631b8c1dcf0b3' + 'f28150d4c0b22a017be51b9f7f9977ed' + '6e488ffecc8ba142c0cf7e2d7aeb832e' + '1cfd310dff0804a7d21958487c32a3b1' + '2ef2429c2c98d0883906aa6f5363be80' + '693c97f2c9a519bb97a17008e92c2b74' + '1745349eb24ed21b4cfaa6f423bddb76' + '7bc65f234dfb6abf24e7c3b03e86f4ff' + 'd41d8cd98f00b204e9800998ecf8427e' + '0e145e18fea8fd190b30d45764f5707c' + '6f48288b6fcaf0065fcb7b0e525413e0' + '22518e922891f9359f971f4f5b4e793c' + 'f45389e116ab0b9e9968287617d27c7d' + 'f3b6ae7db8adffaaa4bffc6099dcbd50' + 'a8a962370cd0128465d514e6a1f74130' + 'd5732ffdb3488e1383d4ea199343e767' + '3807d07215d9116331fe1cf8feeaa0f8') build() { cd ${srcdir} @@ -104,23 +124,3 @@ package() { done ln -s ../man usr/local/share/man } -md5sums=('c61f6ac4f6377108e59879f203f18633' - '6be47d893fd49b2e4a8c0e811b350861' - '9e4533df61f0c82d6b2e2371f7376282' - '4c4540eeb748bf1f71d631b8c1dcf0b3' - 'f28150d4c0b22a017be51b9f7f9977ed' - '6e488ffecc8ba142c0cf7e2d7aeb832e' - '1cfd310dff0804a7d21958487c32a3b1' - '2ef2429c2c98d0883906aa6f5363be80' - '693c97f2c9a519bb97a17008e92c2b74' - '1745349eb24ed21b4cfaa6f423bddb76' - '7bc65f234dfb6abf24e7c3b03e86f4ff' - 'd41d8cd98f00b204e9800998ecf8427e' - '0e145e18fea8fd190b30d45764f5707c' - '6f48288b6fcaf0065fcb7b0e525413e0' - '22518e922891f9359f971f4f5b4e793c' - 'ffe983034b8004989b8c3df97ec91095' - 'f3b6ae7db8adffaaa4bffc6099dcbd50' - 'a8a962370cd0128465d514e6a1f74130' - 'd5732ffdb3488e1383d4ea199343e767' - '3807d07215d9116331fe1cf8feeaa0f8') diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install index 0684afd69..c04374422 100644 --- a/libre/filesystem/filesystem.install +++ b/libre/filesystem/filesystem.install @@ -33,6 +33,7 @@ post_upgrade() { _adduser uuidd -u 68 -d / -g uuidd -s /sbin/nologin _addgroup dbus -g 81 _adduser dbus -u 81 -d / -g dbus -s /sbin/nologin + _addgroup systemd-journal -g 190 # sync gshadow to group (fixes FS#19869) if ! grep -q '^lock:' etc/gshadow; then diff --git a/libre/filesystem/group b/libre/filesystem/group index 3e6645c83..6c91b292f 100644 --- a/libre/filesystem/group +++ b/libre/filesystem/group @@ -32,3 +32,4 @@ scanner:x:96: power:x:98: nobody:x:99: users:x:100: +systemd-journal:x:190: diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow index 253f35838..fb475bfd2 100644 --- a/libre/filesystem/gshadow +++ b/libre/filesystem/gshadow @@ -20,7 +20,7 @@ smmsp::: http::: games::: lock::: -uuidd:!:: +uuidd:x:: dbus:x:: network:x:: video:x:: @@ -32,3 +32,4 @@ scanner:x:: power:x:: nobody::: users::: +systemd-journal:x:: diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 84e67ff44..0191964f8 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179659 2013-03-09 09:20:06Z andyrtr $ +# $Id: PKGBUILD 180013 2013-03-14 18:45:58Z andyrtr $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> @@ -7,7 +7,7 @@ _pkgname=hplip pkgname=hplip-libre pkgver=3.13.3 -pkgrel=1 +pkgrel=2 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)" arch=('i686' 'x86_64' 'mips64el') url="http://hplipopensource.com" @@ -24,9 +24,9 @@ optdepends=('cups: for printing support' 'python2-pyqt: for running hp-toolbox' 'python2-gobject2: for running hp-toolbox' 'libusbx: for advanced usb support') -replaces=("${_pkgname}") -conflicts=("${_pkgname}") -provides=("${_pkgname}=${pkgver}") +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} @@ -94,4 +94,7 @@ package() { chmod 775 "$pkgdir"/var/log/hp{,/tmp} # remove rc script rm -rf "$pkgdir"/etc/init.d + + # fix broken udev rule - FS#34282 + sed -i "s:\$attrs:\$attr:g" $pkgdir/usr/lib/udev/rules.d/56-hpmud_support.rules } |