diff options
Diffstat (limited to 'extra')
55 files changed, 498 insertions, 906 deletions
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index 93140516c..7682e6db2 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178950 2013-03-01 10:19:30Z andrea $ +# $Id: PKGBUILD 182390 2013-04-09 21:23:22Z eric $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> @@ -49,10 +49,8 @@ build() { [ "$CARCH" = "mips64el" ] && \ extra="--disable-mono" - export MOC_QT3=/opt/qt/bin/moc - export MOC_QT4=/usr/lib/qt4/bin/moc - source /etc/profile.d/qt3.sh - source /etc/profile.d/qt4.sh + export MOC_QT3=/usr/bin/moc-qt3 + export MOC_QT4=/usr/bin/moc-qt4 # pygtk requires python2; make it explicit in case other python are installed: FS#21865 PYTHON=python2 \ diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD index 77eb99a84..bc4d2a92d 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179999 2013-03-14 02:05:50Z dan $ +# $Id: PKGBUILD 182157 2013-04-08 13:21:41Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.2 +pkgver=1.8.2.1 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -107,7 +107,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('210834d73c857931c3da34a65eb3e597' - '425e9421a1b128cfb46fa46d94cad919' +md5sums=('3f6ebca116c627490e4ee1f1324d5e65' + '8ec6ab4d8c868305e9a679f5c3d2ccfa' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/gnome-applets/PKGBUILD b/extra/gnome-applets/PKGBUILD deleted file mode 100644 index 7ff3ec0d9..000000000 --- a/extra/gnome-applets/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 170135 2012-11-03 12:57:39Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-applets -pkgver=3.5.92 -pkgrel=1 -pkgdesc="GNOME Applets" -arch=(i686 x86_64 'mips64el') -license=('GPL') -depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify') -makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon' 'networkmanager') -options=(!emptydirs) -url="http://www.gnome.org" -install=gnome-applets.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83') - -build() { - cd "$pkgname-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc --libexecdir=/usr/lib/gnome-applets \ - --localstatedir=/var --disable-static \ - --disable-scrollkeeper --disable-schemas-install \ - --without-hal - make -} - -package() { - cd "$pkgname-$pkgver" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-applets-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas - rm -f "$pkgdir"/etc/gconf/schemas/*.schemas -} diff --git a/extra/gnome-applets/gnome-applets.install b/extra/gnome-applets/gnome-applets.install deleted file mode 100644 index e3441e722..000000000 --- a/extra/gnome-applets/gnome-applets.install +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=gnome-applets - -post_install() { - gconfpkg --install ${pkgname} - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - gconfpkg --uninstall ${pkgname} -} - -post_remove() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/extra/gnome-panel/PKGBUILD b/extra/gnome-panel/PKGBUILD deleted file mode 100644 index bc6b5349d..000000000 --- a/extra/gnome-panel/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 170862 2012-11-12 20:11:06Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-panel -pkgver=3.6.2 -pkgrel=1.1 -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -pkgdesc="The GNOME Panel" -url="http://www.gnome.org" -depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf' - 'gconf' 'telepathy-glib') -makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra') -install=gnome-panel.install -groups=('gnome') -provides=("gnome-panel-bonobo=${pkgver}") -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079') - -build() { - cd "$pkgname-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-panel \ - --disable-scrollkeeper \ - --disable-schemas-compile - make -} - -package() { - cd "$pkgname-$pkgver" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install - - install -m755 -d "$pkgdir/usr/share/gconf/schemas" - gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-panel-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas - rm -f "$pkgdir"/etc/gconf/schemas/*.schemas -} diff --git a/extra/gnome-panel/gnome-panel.install b/extra/gnome-panel/gnome-panel.install deleted file mode 100644 index 0f9324937..000000000 --- a/extra/gnome-panel/gnome-panel.install +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=gnome-panel - -post_install() { - gconfpkg --install $pkgname - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -pre_remove() { - gconfpkg --uninstall $pkgname -} - -post_remove() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} diff --git a/extra/gnome-phone-manager/PKGBUILD b/extra/gnome-phone-manager/PKGBUILD deleted file mode 100644 index 6ecde393f..000000000 --- a/extra/gnome-phone-manager/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 169906 2012-10-30 22:34:29Z heftig $ -# Maintainer: Roman Kyrylych <roman@archlinux.org> - -pkgname=gnome-phone-manager -pkgver=0.68 -pkgrel=3 -pkgdesc="Control your mobile phone from your GNOME desktop." -arch=('i686' 'x86_64' 'mips64el') -url="http://live.gnome.org/PhoneManager" -license=('GPL') -depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' 'libcanberra' 'gconf') -makedepends=('intltool') -options=('!emptydirs' '!libtool') -install=gnome-phone-manager.install -source=(ftp://ftp.archlinux.org/other/gnome-phone-manager/gnome-phone-manager-0.68-git20121019.tar.xz - gnome-phone-manager-0.68-eds.patch) -sha256sums=('885dfa80989c633a5ae8b118c9b7c903e18e44f0e9fc89e6a9bae05da87c9b15' - '98d5c2d3034081eebbaa0dac85f53dcc40c8970114f5711aff8c37bab2931a66') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../gnome-phone-manager-0.68-eds.patch - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-phone-manager "${pkgdir}"/etc/gconf/schemas/*.schemas - rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas -} diff --git a/extra/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch b/extra/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch deleted file mode 100644 index 2a36de13a..000000000 --- a/extra/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch +++ /dev/null @@ -1,386 +0,0 @@ -diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.c b/cut-n-paste/e-contact-entry/e-contact-entry.c -index dc8e2e3..d95e5b9 100644 ---- a/cut-n-paste/e-contact-entry/e-contact-entry.c -+++ b/cut-n-paste/e-contact-entry/e-contact-entry.c -@@ -38,11 +38,6 @@ - #include <glib.h> - #include <glib/gi18n.h> - --#include <libedataserver/e-source.h> --#include <libebook/e-book.h> --#include <libebook/e-book-view.h> --#include <libebook/e-contact.h> -- - #include "e-contact-entry.h" - #include "econtactentry-marshal.h" - -@@ -59,7 +54,7 @@ static int signals[LAST_SIGNAL] = { 0 }; - /* Properties */ - enum { - PROP_0, /* TODO: why? */ -- PROP_SOURCE_LIST, -+ PROP_REGISTRY, - PROP_COMPLETE_LENGTH, - }; - -@@ -70,7 +65,7 @@ enum { - struct EContactEntryPriv { - GtkEntryCompletion *completion; - GtkListStore *store; -- ESourceList *source_list; -+ ESourceRegistry *registry; - /* A list of EntryLookup structs we are searching */ - GList *lookup_entries; - /* Number of characters to start searching at */ -@@ -227,7 +222,7 @@ e_contact_entry_display_func (EContact *contact) - emails = e_contact_get (contact, E_CONTACT_EMAIL); - for (l = emails; l != NULL; l = l->next) { - item = g_new0 (EContactEntyItem, 1); -- item->identifier = item->identifier = g_strdup (l->data); -+ item->identifier = g_strdup (l->data); - item->display_string = g_strdup_printf ("%s <%s>", (char*)e_contact_get_const (contact, E_CONTACT_NAME_OR_ORG), item->identifier); - - items = g_list_prepend (items, item); -@@ -276,22 +271,13 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data) - return; - - photo = e_contact_get (contact, E_CONTACT_PHOTO); --#ifndef HAVE_ECONTACTPHOTOTYPE -- if (photo) { --#else - if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) { --#endif - GdkPixbufLoader *loader; - - loader = gdk_pixbuf_loader_new (); - --#ifndef HAVE_ECONTACTPHOTOTYPE -- if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data, -- photo->length, NULL)) --#else - if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data.inlined.data, - photo->data.inlined.length, NULL)) --#endif - pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); - - if (pixbuf) { -@@ -339,16 +325,15 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data) - * The query on the EBookView has completed. - */ - static void --view_completed_cb (EBookView *book_view, EBookViewStatus status, gpointer user_data) -+view_completed_cb (EBookView *book_view, EBookViewStatus status, const gchar *message, gpointer user_data) - { - EntryLookup *lookup; - g_return_if_fail (user_data != NULL); -- /* TODO: handle status != OK */ -- g_return_if_fail (status == E_BOOK_ERROR_OK); - g_return_if_fail (book_view != NULL); - - lookup = (EntryLookup*)user_data; - g_object_unref (lookup->bookview); -+ lookup->bookview = NULL; - } - - /** -@@ -373,8 +358,8 @@ bookview_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer clo - lookup->bookview = book_view; - g_object_add_weak_pointer ((GObject*)book_view, (gpointer*)&lookup->bookview); - -- g_signal_connect (book_view, "contacts_added", (GCallback)view_contacts_added_cb, lookup); -- g_signal_connect (book_view, "sequence_complete", (GCallback)view_completed_cb, lookup); -+ g_signal_connect (book_view, "contacts-added", (GCallback)view_contacts_added_cb, lookup); -+ g_signal_connect (book_view, "view_complete", (GCallback)view_completed_cb, lookup); - - e_book_view_start (book_view); - } -@@ -396,6 +381,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data) - if (lookup->bookview) { - e_book_view_stop (lookup->bookview); - g_object_unref (lookup->bookview); -+ lookup->bookview = NULL; - } - } - -@@ -410,7 +396,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data) - if (!lookup->open) - continue; - -- if (e_book_async_get_book_view (lookup->book, query, NULL, 11, (EBookBookViewCallback)bookview_cb, lookup) != 0) { -+ if (e_book_async_get_book_view (lookup->book, query, NULL, MAX_ENTRIES, (EBookBookViewCallback)bookview_cb, lookup) == FALSE) { - g_signal_emit (entry, signals[ERROR], 0, _("Cannot create searchable view.")); - } - } -@@ -458,11 +444,12 @@ book_opened_cb (EBook *book, EBookStatus status, gpointer data) - */ - - void --e_contact_entry_set_source_list (EContactEntry *entry, -- ESourceList *source_list) -+e_contact_entry_set_registry (EContactEntry *entry, -+ ESourceRegistry *registry) - { -+ GList *list, *link; -+ const gchar *extension_name; - GError *error = NULL; -- GSList *list, *l; - - g_return_if_fail (E_IS_CONTACT_ENTRY (entry)); - -@@ -471,58 +458,48 @@ e_contact_entry_set_source_list (EContactEntry *entry, - g_list_foreach (entry->priv->lookup_entries, (GFunc)lookup_entry_free, NULL); - g_list_free (entry->priv->lookup_entries); - } -- if (entry->priv->source_list) { -- g_object_unref (entry->priv->source_list); -+ if (entry->priv->registry) { -+ g_object_unref (entry->priv->registry); - } - - /* If we have no new sources, disable and return here */ -- if (source_list == NULL) { -+ if (registry == NULL) { - g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE); -- entry->priv->source_list = NULL; -+ entry->priv->registry = NULL; - entry->priv->lookup_entries = NULL; - return; - } - -- entry->priv->source_list = source_list; -- /* So that the list isn't going away underneath us */ -- g_object_ref (entry->priv->source_list); -+ entry->priv->registry = registry; -+ /* So that the registry isn't going away underneath us */ -+ g_object_ref (entry->priv->registry); - -- /* That gets us a list of ESourceGroup */ -- list = e_source_list_peek_groups (source_list); - entry->priv->lookup_entries = NULL; - -- for (l = list; l != NULL; l = l->next) { -- ESourceGroup *group = l->data; -- GSList *sources = NULL, *m; -- /* That should give us a list of ESource */ -- sources = e_source_group_peek_sources (group); -- for (m = sources; m != NULL; m = m->next) { -- ESource *source = m->data; -- ESource *s = e_source_copy (source); -- EntryLookup *lookup; -- char *uri; -+ extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK; -+ list = e_source_registry_list_sources (registry, extension_name); - -- uri = g_strdup_printf("%s/%s", e_source_group_peek_base_uri (group), e_source_peek_relative_uri (source)); -- e_source_set_absolute_uri (s, uri); -- g_free (uri); -+ for (link = list; link != NULL; link = g_list_next (link)) { -+ ESource *source = E_SOURCE (link->data); -+ EntryLookup *lookup; - -- /* Now add those to the lookup entries list */ -- lookup = g_new0 (EntryLookup, 1); -- lookup->entry = entry; -- lookup->status = E_BOOK_ERROR_OK; -- lookup->open = FALSE; -+ /* Now add those to the lookup entries list */ -+ lookup = g_new0 (EntryLookup, 1); -+ lookup->entry = entry; -+ lookup->status = E_BOOK_ERROR_OK; -+ lookup->open = FALSE; - -- if ((lookup->book = e_book_new (s, &error)) == NULL) { -- /* TODO handle this better, fire the error signal I guess */ -+ if ((lookup->book = e_book_new (source, &error)) == NULL) { -+ /* TODO handle this better, fire the error signal I guess */ -+ if (error) { - g_warning ("%s", error->message); -- g_error_free (error); -- g_free (lookup); -- } else { -- entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup); -- e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup); -+ g_error_free (error); -+ error = NULL; - } -- -- g_object_unref (s); -+ g_free (lookup); -+ } else { -+ entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup); -+ e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup); - } - } - -@@ -530,12 +507,12 @@ e_contact_entry_set_source_list (EContactEntry *entry, - g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE); - } - --ESourceList * --e_contact_entry_get_source_list (EContactEntry *entry) -+ESourceRegistry * -+e_contact_entry_get_registry (EContactEntry *entry) - { - g_return_val_if_fail (E_IS_CONTACT_ENTRY (entry), NULL); - -- return entry->priv->source_list; -+ return entry->priv->registry; - } - - void -@@ -601,8 +578,8 @@ e_contact_entry_set_property (GObject *object, guint property_id, const GValue * - entry = E_CONTACT_ENTRY (object); - - switch (property_id) { -- case PROP_SOURCE_LIST: -- e_contact_entry_set_source_list (entry, g_value_get_object (value)); -+ case PROP_REGISTRY: -+ e_contact_entry_set_registry (entry, g_value_get_object (value)); - break; - case PROP_COMPLETE_LENGTH: - e_contact_entry_set_complete_length (entry, g_value_get_int (value)); -@@ -620,8 +597,8 @@ e_contact_entry_get_property (GObject *object, guint property_id, GValue *value, - entry = E_CONTACT_ENTRY (object); - - switch (property_id) { -- case PROP_SOURCE_LIST: -- g_value_set_object (value, e_contact_entry_get_source_list (entry)); -+ case PROP_REGISTRY: -+ g_value_set_object (value, e_contact_entry_get_registry (entry)); - break; - case PROP_COMPLETE_LENGTH: - g_value_set_int (value, e_contact_entry_get_complete_length (entry)); -@@ -644,7 +621,7 @@ e_contact_entry_finalize (GObject *object) - g_list_free (entry->priv->lookup_entries); - g_object_unref (entry->priv->completion); - g_object_unref (entry->priv->store); -- g_object_unref (entry->priv->source_list); -+ g_object_unref (entry->priv->registry); - - if (entry->priv->display_destroy) { - entry->priv->display_destroy (entry->priv->display_func); -@@ -657,7 +634,7 @@ e_contact_entry_finalize (GObject *object) - static void - reset_search_fields (EContactEntry *entry) - { -- EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, E_CONTACT_ORG, 0 }; -+ EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, 0 }; - - g_free (entry->priv->search_fields); - entry->priv->search_fields = g_new0 (EContactField, G_N_ELEMENTS (fields)); -@@ -716,9 +693,9 @@ e_contact_entry_class_init (EContactEntryClass *klass) - object_class->finalize = e_contact_entry_finalize; - - /* Properties */ -- g_object_class_install_property (object_class, PROP_SOURCE_LIST, -- g_param_spec_object ("source-list", "Source List", "The source list to search for contacts.", -- E_TYPE_SOURCE_LIST, G_PARAM_READWRITE)); -+ g_object_class_install_property (object_class, PROP_REGISTRY, -+ g_param_spec_object ("registry", "Registry", "Data source registry.", -+ E_TYPE_SOURCE_REGISTRY, G_PARAM_READWRITE)); - - g_object_class_install_property (object_class, PROP_COMPLETE_LENGTH, - g_param_spec_int ("complete-length", "Complete length", "Number of characters to start a search on.", -@@ -771,6 +748,7 @@ lookup_entry_free (EntryLookup *lookup) - if (lookup->bookview) { - g_warning("EBookView still around"); - g_object_unref (lookup->bookview); -+ lookup->bookview = NULL; - } - if (lookup->book) { - g_object_unref (lookup->book); -diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.h b/cut-n-paste/e-contact-entry/e-contact-entry.h -index bf6b39b..6fedef7 100644 ---- a/cut-n-paste/e-contact-entry/e-contact-entry.h -+++ b/cut-n-paste/e-contact-entry/e-contact-entry.h -@@ -23,10 +23,8 @@ - #ifndef CONTACT_ENTRY_H - #define CONTACT_ENTRY_H - --#include <libedataserver/e-source-group.h> --#include <libedataserver/e-source-list.h> --#include <libebook/e-contact.h> - #include <gtk/gtk.h> -+#include <libebook/libebook.h> - - G_BEGIN_DECLS - -@@ -71,8 +69,8 @@ GType e_contact_entry_get_type (void); - - GtkWidget *e_contact_entry_new (void); - --void e_contact_entry_set_source_list (EContactEntry *entry, ESourceList *list); --ESourceList *e_contact_entry_get_source_list (EContactEntry *entry); -+void e_contact_entry_set_registry (EContactEntry *entry, ESourceRegistry *registry); -+ESourceRegistry *e_contact_entry_get_registry (EContactEntry *entry); - - void e_contact_entry_set_complete_length(EContactEntry *entry, int length); - int e_contact_entry_get_complete_length(EContactEntry *entry); -diff --git a/libgsm/phonemgr-utils.c b/libgsm/phonemgr-utils.c -index 4e62e10..baef34f 100644 ---- a/libgsm/phonemgr-utils.c -+++ b/libgsm/phonemgr-utils.c -@@ -27,7 +27,7 @@ - #include <glib.h> - #include <glib/gstdio.h> - #include <glib-object.h> --#include <libebook/e-contact.h> -+#include <libebook/libebook.h> - #include <gnokii.h> - - #include <bluetooth/bluetooth.h> -diff --git a/src/e-phone-entry.c b/src/e-phone-entry.c -index 5d25622..38f4c2f 100644 ---- a/src/e-phone-entry.c -+++ b/src/e-phone-entry.c -@@ -31,8 +31,7 @@ - - #include <gtk/gtk.h> - #include <string.h> --#include <libedataserver/e-source-list.h> --#include <libedataserverui/e-client-utils.h> -+#include <libedataserverui/libedataserverui.h> - #include "e-phone-entry.h" - - #define CONTACT_FORMAT "%s (%s)" -@@ -181,25 +180,25 @@ e_phone_entry_finalize (GObject *object) - } - - static void --add_sources (EContactEntry *entry) --{ -- ESourceList *source_list; -- -- if (e_client_utils_get_sources (&source_list, -- E_CLIENT_SOURCE_TYPE_CONTACTS, -- NULL)) { -- e_contact_entry_set_source_list (E_CONTACT_ENTRY (entry), -- source_list); -- g_object_unref (source_list); -- } --} -- --static void - e_phone_entry_init (EPhoneEntry *entry) - { - EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_NICKNAME, E_CONTACT_ORG, E_CONTACT_PHONE_MOBILE, 0 }; -+ ESourceRegistry *registry; -+ GError *error = NULL; -+ -+ /* XXX This call blocks while a D-Bus connection is made, possibly -+ * requiring activation. Might be better to create the registry -+ * in main(), pass it to ui_init(), and have e_phone_entry_new() -+ * take it as an argument. Calling this from main() means if it -+ * fails you can abort cleanly with a console error message. */ -+ registry = e_source_registry_new_sync (NULL, &error); -+ if (registry == NULL) { -+ g_error ("%s: %s", G_STRFUNC, error->message); -+ g_assert_not_reached (); -+ } -+ e_contact_entry_set_registry (E_CONTACT_ENTRY (entry), registry); -+ g_object_unref (registry); - -- add_sources (E_CONTACT_ENTRY (entry)); - e_contact_entry_set_search_fields (E_CONTACT_ENTRY (entry), (const EContactField *)fields); - e_contact_entry_set_display_func (E_CONTACT_ENTRY (entry), test_display_func, NULL, NULL); - g_signal_connect (G_OBJECT (entry), "contact_selected", diff --git a/extra/gnome-phone-manager/gnome-phone-manager.install b/extra/gnome-phone-manager/gnome-phone-manager.install deleted file mode 100644 index 91212fa2e..000000000 --- a/extra/gnome-phone-manager/gnome-phone-manager.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=gnome-phone-manager - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/extra/gnome-screensaver/PKGBUILD b/extra/gnome-screensaver/PKGBUILD deleted file mode 100644 index a90034576..000000000 --- a/extra/gnome-screensaver/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 169908 2012-10-30 22:34:33Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Contributor: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-screensaver -pkgver=3.6.1 -pkgrel=1 -pkgdesc="Screensaver designed to integrate well with the GNOME desktop." -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://live.gnome.org/GnomeScreensaver" -backup=(etc/pam.d/gnome-screensaver) -depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas' 'libsystemd') -makedepends=('pkgconfig' 'intltool' 'libxss') -groups=('gnome') -options=(!emptydirs) -install=gnome-screensaver.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - gnome-screensaver.pam) -sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0' - 'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gnome-screensaver \ - --localstatedir=/var \ - --with-mit-ext --with-systemd - - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver" -} diff --git a/extra/gnome-screensaver/gnome-screensaver.install b/extra/gnome-screensaver/gnome-screensaver.install deleted file mode 100644 index d1a42c6ce..000000000 --- a/extra/gnome-screensaver/gnome-screensaver.install +++ /dev/null @@ -1,7 +0,0 @@ -pkgname=gnome-screensaver - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - gconfpkg --uninstall ${pkgname} - fi -} diff --git a/extra/gnome-screensaver/gnome-screensaver.pam b/extra/gnome-screensaver/gnome-screensaver.pam deleted file mode 100644 index 453dae646..000000000 --- a/extra/gnome-screensaver/gnome-screensaver.pam +++ /dev/null @@ -1,3 +0,0 @@ -#%PAM-1.0 -auth required pam_unix_auth.so nullok -auth optional pam_gnome_keyring.so diff --git a/extra/java-commons-daemon/PKGBUILD b/extra/java-commons-daemon/PKGBUILD index f4db99a74..fda87ac94 100644 --- a/extra/java-commons-daemon/PKGBUILD +++ b/extra/java-commons-daemon/PKGBUILD @@ -1,14 +1,14 @@ # Maintainer: Guillaume ALAUX <guillaume@archlinux.org> pkgname=('java-commons-daemon' 'java-jsvc') pkgbase=java-commons-daemon -pkgver=1.0.12 +pkgver=1.0.15 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://commons.apache.org/daemon/' license=('APACHE') _libname=commons-daemon source=(http://archive.apache.org/dist/commons/daemon/source/${_libname}-${pkgver}-src.tar.gz) -sha256sums=('09135e4f3a26ebdd6d3035e2e7f631568af06beae32808527217373e3e31a9d0') +sha256sums=('11ee57d2c6b281589c1497b2f88180553f06d5ac1560ce1841e05f89f0342432') makedepends=('apache-ant' 'docbook2x' 'docbook-xsl') build() { diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD index ff6cd1239..9f21d9a2d 100644 --- a/extra/kdelibs3/PKGBUILD +++ b/extra/kdelibs3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178619 2013-02-25 20:45:02Z andyrtr $ +# $Id: PKGBUILD 182393 2013-04-09 21:34:09Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -38,7 +38,6 @@ sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82' build() { cd "$srcdir"/kdelibs-${pkgver} - . /etc/profile.d/qt3.sh . "$srcdir"/kde3.profile patch -p0 -i "$srcdir"/kde-3.5-1074156.patch diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 7eff22114..e10c14e1f 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181992 2013-04-05 08:57:03Z svenstaro $ +# $Id: PKGBUILD 182386 2013-04-09 20:40:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -21,7 +21,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktnef' 'kdepim-libkdepim') pkgver=4.10.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -29,12 +29,15 @@ groups=('kde' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent' 'nepomuk-widgets') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" - "kleopatra-build-fix.patch::http://bugsfiles.kde.org/attachment.cgi?id=78592") + "kleopatra-build-fix.patch::http://bugsfiles.kde.org/attachment.cgi?id=78592" + 'fix-completion.patch') sha1sums=('61b74cb3bf541040e09252d4dcfaea8a876a2859' - '61a7e31e7daee3358c442d3ac5f74171b45ae2c9') + '61a7e31e7daee3358c442d3ac5f74171b45ae2c9' + '92a44c7b1697de519b09265a3b68e7d73d4c024e') build() { patch -Np1 -d ${pkgbase}-${pkgver} < ${srcdir}/kleopatra-build-fix.patch + patch -Np1 -d ${pkgbase}-${pkgver} < ${srcdir}/fix-completion.patch mkdir build cd build diff --git a/extra/kdepim/fix-completion.patch b/extra/kdepim/fix-completion.patch new file mode 100644 index 000000000..c2edefe00 --- /dev/null +++ b/extra/kdepim/fix-completion.patch @@ -0,0 +1,182 @@ +commit 6a06c57f52a00018d607085efa7570deb91dc707 +Author: David Faure <faure@kde.org> +Date: Mon Apr 8 17:41:39 2013 +0200 + + Fix kmail autocompletion from akonadi. + + My commit 02f5f0214e made autocompletion from nepomuk work better, but broke + completion from akonadi. I kept the "keywords" based code, but now it's only + used for the special case of nickname-based search (because the nickname shouldn't + appear in the completion item). For everything else it really doesn't make sense + to have a search engine (akonadi/nepomuk) on top of a search engine + (the one inside KCompletion). + + This time I verified that: + * nepomuk search still works + * contacts from akonadi work again + * contact groups from akonadi work (after previous commit) + * nickname-search in akonadi still doesn't work, but it didn't before. More work + needed for that one. This is the only reason to keep KMailCompletion around btw, + everything else would work without it. + + BUG: 259949 + FIXED-IN: 4.10.3 + +diff --git a/libkdepim/addresseelineedit.cpp b/libkdepim/addresseelineedit.cpp +index b7b11be..ec4caf9 100644 +--- a/libkdepim/addresseelineedit.cpp ++++ b/libkdepim/addresseelineedit.cpp +@@ -30,6 +30,8 @@ + #include "completionordereditor.h" + #endif + ++#include "kmailcompletion.h" ++ + #include <Akonadi/Contact/ContactSearchJob> + #include <Akonadi/Contact/ContactGroupSearchJob> + #include <Akonadi/CollectionFetchJob> +@@ -77,6 +79,10 @@ + + using namespace KPIM; + ++namespace KPIM { ++ typedef QMap< QString, QPair<int,int> > CompletionItemsMap; ++} ++ + class AddresseeLineEditStatic + { + public: +@@ -496,11 +502,9 @@ void AddresseeLineEdit::Private::addCompletionItem( const QString &string, int w + s_static->completionItemMap.insert( string, qMakePair( weight, completionItemSource ) ); + } + +- if ( keyWords == 0 ) { +- s_static->completion->addItem( string, weight ); +- } else { +- s_static->completion->addItemWithKeys( string, weight, keyWords ); +- } ++ s_static->completion->addItem(string, weight); ++ if (keyWords && !keyWords->isEmpty()) ++ s_static->completion->addItemWithKeys(string, weight, keyWords); // see kmailcompletion.cpp + } + + const QStringList KPIM::AddresseeLineEdit::Private::adjustedCompletionItems( bool fullSearch ) +@@ -1348,17 +1352,13 @@ void AddresseeLineEdit::addItem( const Akonadi::Item &item, int weight, int sour + void AddresseeLineEdit::addContactGroup( const KABC::ContactGroup &group, int weight, int source ) + { + d->addCompletionItem( group.name(), weight, source ); +- QStringList keyWords; +- keyWords.append( group.name() ); +- d->addCompletionItem( group.name(), weight, source, &keyWords ); + } + + void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int source ) + { + const QStringList emails = addr.emails(); + QStringList::ConstIterator it; +- const int prefEmailWeight = 1; //increment weight by prefEmailWeight +- int isPrefEmail = prefEmailWeight; //first in list is preferredEmail ++ int isPrefEmail = 1; //first in list is preferredEmail + QStringList::ConstIterator end( emails.constEnd() ); + for ( it = emails.constBegin(); it != end; ++it ) { + //TODO: highlight preferredEmail +@@ -1368,40 +1368,6 @@ void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int + const QString nickName = addr.nickName(); + QString fullEmail = addr.fullEmail( email ); + +- // Prepare keywords (for CompletionShell, CompletionPopup) +- QStringList keyWords; +- const QString realName = addr.realName(); +- +- if ( !givenName.isEmpty() && !familyName.isEmpty() ) { +- keyWords.append( givenName + QLatin1Char( ' ' ) + familyName ); +- keyWords.append( familyName + QLatin1Char( ' ' ) + givenName ); +- keyWords.append( familyName + QLatin1String( ", " ) + givenName ); +- } else if ( !givenName.isEmpty() ) { +- keyWords.append( givenName ); +- } else if ( !familyName.isEmpty() ) { +- keyWords.append( familyName ); +- } +- +- if ( !nickName.isEmpty() ) { +- keyWords.append( nickName ); +- } +- +- if ( !realName.isEmpty() ) { +- keyWords.append( realName ); +- } +- +- keyWords.append( email ); +- +- /* KMailCompletion does not have knowledge about identities, it stores emails and +- * keywords for each email. KMailCompletion::allMatches does a lookup on the +- * keywords and returns an ordered list of emails. In order to get the preferred +- * email before others for each identity we use this little trick. +- * We remove the <blank> in adjustedCompletionItems. +- */ +- if ( isPrefEmail == prefEmailWeight ) { +- fullEmail.replace( QLatin1String( " <" ), QLatin1String( " <" ) ); +- } +- + // Prepare "givenName" + ' ' + "familyName" + QString fullName = givenName; + if (!familyName.isEmpty()) { +@@ -1413,12 +1379,16 @@ void AddresseeLineEdit::addContact( const KABC::Addressee &addr, int weight, int + // Finally, we can add the completion items + if (!fullName.isEmpty()) { + const QString address = KPIMUtils::normalizedAddress(fullName, email, QString()); +- d->addCompletionItem(address, weight + isPrefEmail, source, &keyWords); ++ if (fullEmail != address) { ++ // This happens when fullEmail contains a middle name, while our own fullName+email only has "first last". ++ // Let's offer both, the fullEmail with 3 parts, looks a tad formal. ++ d->addCompletionItem(address, weight + isPrefEmail, source); ++ } + } + +- if ( !nickName.isEmpty() ) { +- const QString address = KPIMUtils::normalizedAddress(nickName, email, QString()); +- d->addCompletionItem(address, weight + isPrefEmail, source, &keyWords); ++ QStringList keyWords; ++ if (!nickName.isEmpty()) { ++ keyWords.append(nickName); + } + + d->addCompletionItem( fullEmail, weight + isPrefEmail, source, &keyWords ); +diff --git a/libkdepim/addresseelineedit.h b/libkdepim/addresseelineedit.h +index 4e6784b..b2af4a9 100644 +--- a/libkdepim/addresseelineedit.h ++++ b/libkdepim/addresseelineedit.h +@@ -27,7 +27,6 @@ + #ifndef KDEPIM_ADDRESSEELINEEDIT_H + #define KDEPIM_ADDRESSEELINEEDIT_H + +-#include "kmailcompletion.h" + #include "kdepim_export.h" + + #include "ldap/ldapclient.h" +@@ -50,10 +49,6 @@ namespace KABC { + class ContactGroup; + } + +-namespace KPIM { +- typedef QMap< QString, QPair<int,int> > CompletionItemsMap; +-} +- + namespace Nepomuk2 { + namespace Query { + class Result; +diff --git a/libkdepim/kmailcompletion.h b/libkdepim/kmailcompletion.h +index e8574cc..93771d3 100644 +--- a/libkdepim/kmailcompletion.h ++++ b/libkdepim/kmailcompletion.h +@@ -32,7 +32,9 @@ namespace KPIM { + + /** + * KMailCompletion allows lookup of email addresses by keyword. +- * Typically a keywods would be firstname, lastname, nickname or domain. ++ * This is used for lookup by nickname, since we don't want the nickname to appear in the final email. ++ * E.g. you have a nickname "idiot" for your boss, you want to type "idiot" but you want the completion ++ * to offer "Full Name <email@domain>", without the nickname being visible. + */ + class KMailCompletion : public KCompletion + { diff --git a/extra/kexec-tools/PKGBUILD b/extra/kexec-tools/PKGBUILD index 7c50cd51c..335458d4b 100644 --- a/extra/kexec-tools/PKGBUILD +++ b/extra/kexec-tools/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 170845 2012-11-12 15:18:26Z tpowa $ +# $Id: PKGBUILD 182155 2013-04-08 13:04:10Z tpowa $ # Contributor: Camille Moncelier <pix@devlife.org>, simo <simo@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=kexec-tools -pkgver=2.0.3 -pkgrel=2 +pkgver=2.0.4 +pkgrel=1 pkgdesc="Load another kernel from the currently executing Linux kernel" arch=('i686' 'x86_64' 'mips64el') url="http://kernel.org/pub/linux/utils/kernel/kexec/" source=("ftp://ftp.archlinux.org/other/kexec-tools/kexec-tools-${pkgver}.tar.bz2" + # upstream tarballs broken with bsdtar! #"http://kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-${pkgver}.tar.bz2" - 'kexec' - 'kexec.conf.d') + ) depends=('gawk' 'zlib' 'xz') backup=('etc/conf.d/kexec') license=('GPL2') @@ -29,9 +29,5 @@ package() { mv $pkgdir/usr/sbin $pkgdir/sbin install -D -m644 kexec/kexec.8 $pkgdir/usr/share/man/man8/kexec.8 - install -D -m644 $srcdir/kexec.conf.d $pkgdir/etc/conf.d/kexec - install -D -m755 $srcdir/kexec $pkgdir/etc/rc.d/kexec } -md5sums=('3d9ff82e8e16165b9e79ded271c08348' - 'be059a103e5989519d22fca99f860a64' - '9ca7e31d2c5c66c436a9a2baf20ad9b2') +md5sums=('4713026758923f5f3968905291b991ee') diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD index ac0fdfbca..90581e839 100644 --- a/extra/libpng/PKGBUILD +++ b/extra/libpng/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 178758 2013-02-26 18:11:18Z ioni $ +# $Id: PKGBUILD 182372 2013-04-09 18:14:06Z ioni $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=libpng -pkgver=1.5.14 -_apngver=1.5.14 +pkgver=1.5.15 +_apngver=1.5.15 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ depends=('zlib' 'sh') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz" "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz") -md5sums=('94284b01d62ca43c5eb3f6702db08ed8' - '89fbc11f19ec1f181587bdde1dd9402f') +md5sums=('e3122e7b5b5c36c034a4624c65f8a9d8' + '3ae9ea7e4bd201f0b25e25cd6049b094') build() { cd $pkgname-$pkgver diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD index daebd5ba6..e822af1bc 100644 --- a/extra/libva-intel-driver/PKGBUILD +++ b/extra/libva-intel-driver/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 170694 2012-11-09 19:58:58Z ibiru $ +# $Id: PKGBUILD 182376 2013-04-09 18:36:11Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgname=libva-intel-driver -pkgver=1.0.19 +pkgver=1.0.20 pkgrel=1 pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family." arch=('i686' 'x86_64') @@ -12,11 +12,11 @@ depends=('libva') options=('!libtool') replaces=('libva-driver-intel') source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('9b1c92ca2b59b3b150fd45cb01775e0c114a41a7') +sha1sums=('0aeba2d78f02c4f2c13b519c468e04fa88b2ae3e') build() { cd $pkgname-$pkgver - ./autogen.sh --prefix=/usr + ./configure --prefix=/usr make } diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD index d472b7288..5542ce890 100644 --- a/extra/libva/PKGBUILD +++ b/extra/libva/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168381 2012-10-09 16:30:41Z ibiru $ +# $Id: PKGBUILD 182375 2013-04-09 18:35:29Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgname=libva -pkgver=1.1.0 -pkgrel=2.1 +pkgver=1.1.1 +pkgrel=1 pkgdesc="Video Acceleration (VA) API for Linux" arch=('i686' 'x86_64' 'mips64el') url="http://freedesktop.org/wiki/Software/vaapi" @@ -13,14 +13,11 @@ makedepends=('mesa') optdepends=('libva-vdpau-driver: vdpau back-end for nvidia' 'libva-intel-driver: back-end for intel cards') options=('!libtool') -source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2 - libva-1.1.0-wayland1.patch) -sha1sums=('af6e912ea86a6378992f5783390ab9cb8e5cadf9' - '0807d1ea5aee22af8eddb9d623fa324ded7fa3f4') +source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) +sha1sums=('755e488677a196c9ac18b8c0d11aa2a56e050306') build() { cd "$pkgname-$pkgver" - patch -Np1 -i ${srcdir}/libva-1.1.0-wayland1.patch ./configure --prefix=/usr make } diff --git a/extra/libwnck3/PKGBUILD b/extra/libwnck3/PKGBUILD index 985cd5b24..72701a12b 100644 --- a/extra/libwnck3/PKGBUILD +++ b/extra/libwnck3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170860 2012-11-12 20:09:16Z heftig $ +# $Id: PKGBUILD 182596 2013-04-10 21:34:12Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libwnck3 _pkgbasename=libwnck -pkgver=3.4.4 -pkgrel=1.1 +pkgver=3.4.5 +pkgrel=1 pkgdesc="Window Navigator Construction Kit (GTK+3)" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org/" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('a545a23ea7681fafae033b4f68b69ef022d446a9325286291bb8882b9016a130') +sha256sums=('560f9709405fb33500c2f79efabdb1c4056866dec281f354ad3da97181fbf381') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index a389ac636..d059e659e 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182095 2013-04-06 19:27:44Z giovanni $ +# $Id: PKGBUILD 182366 2013-04-09 15:06:58Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.04.06 +pkgver=2013.04.08 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('1cd8e5181a1ddd29537cb16ad3cb0138') +md5sums=('25ff9f7bf9e47c699878e58c7789ee13') build() { cd ${srcdir}/live diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 3cf05fd7a..7b45f3125 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179489 2013-03-05 16:36:25Z giovanni $ +# $Id: PKGBUILD 182356 2013-04-08 21:42:10Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.5.2 +pkgver=2.5.4 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('6b467f41a262e2537cf927ed42d0fdda' +md5sums=('f3c64086519c32ba7e892b6215b0fcbc' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/metacity/PKGBUILD b/extra/metacity/PKGBUILD deleted file mode 100644 index 1cd7292f7..000000000 --- a/extra/metacity/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 170056 2012-10-31 10:19:33Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=metacity -pkgver=2.34.13 -pkgrel=1.1 -pkgdesc="A window manager for GNOME" -arch=(i686 x86_64 'mips64el') -license=('GPL') -depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra' 'libgtop' 'libsm' 'startup-notification' 'zenity') -makedepends=('intltool' 'yelp-tools') -url="http://www.gnome.org" -groups=('gnome') -options=('!libtool' '!emptydirs') -install=metacity.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - fix_compositing_startup.patch) -sha256sums=('8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075' - '5094a0ffe3eb8289ed752829877c2e1b743eddf938ad3fc92fb4574b42765ae2') - -build() { - cd "$pkgname-$pkgver" - patch -Np1 -i "${srcdir}/fix_compositing_startup.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/metacity \ - --localstatedir=/var --disable-static \ - --disable-schemas-compile - make -} - -package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/extra/metacity/fix_compositing_startup.patch b/extra/metacity/fix_compositing_startup.patch deleted file mode 100644 index 56b218ae7..000000000 --- a/extra/metacity/fix_compositing_startup.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur metacity-2.34.5.orig/src/compositor/compositor-xrender.c metacity-2.34.5/src/compositor/compositor-xrender.c ---- metacity-2.34.5.orig/src/compositor/compositor-xrender.c 2011-11-10 15:14:34.000000000 +0100 -+++ metacity-2.34.5/src/compositor/compositor-xrender.c 2012-08-28 14:23:04.093750568 +0200 -@@ -3066,6 +3057,8 @@ - #endif - - xrc->enabled = TRUE; -+ xrc->show_redraw = FALSE; -+ xrc->debug = FALSE; - g_timeout_add (2000, (GSourceFunc) timeout_debug, xrc); - - return compositor; diff --git a/extra/metacity/metacity.install b/extra/metacity/metacity.install deleted file mode 100644 index ba0feffc1..000000000 --- a/extra/metacity/metacity.install +++ /dev/null @@ -1,19 +0,0 @@ -pkgname=metacity - -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas -} - -pre_upgrade() { - if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then - /usr/sbin/gconfpkg --uninstall $pkgname - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD index 64352bd03..c1af1911b 100644 --- a/extra/mtr/PKGBUILD +++ b/extra/mtr/PKGBUILD @@ -1,30 +1,25 @@ -# $Id: PKGBUILD 178764 2013-02-26 18:56:25Z ioni $ +# $Id: PKGBUILD 182370 2013-04-09 18:07:19Z ioni $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mtr pkgname=(mtr mtr-gtk) -pkgver=0.83 +pkgver=0.84 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') makedepends=('ncurses' 'gtk2') -source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz - mtr-glib2.patch) +source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz) url="http://www.bitwizard.nl/mtr/" -md5sums=('2e3a40f2da47748ad0053a5d678b9b4a' - '6bce08e1de7c6835bdda893847981bc8') +md5sums=('df61096ae1b18b27f915feeb907ae48c') build() { - patch -Np0 -i mtr-glib2.patch cp -r $pkgbase-$pkgver $pkgbase-cli cd mtr-cli - ./bootstrap.sh ./configure --prefix=/usr --without-gtk make cd "$srcdir/$pkgbase-$pkgver" - ./bootstrap.sh ./configure --prefix=/usr make } diff --git a/extra/mtr/mtr-glib2.patch b/extra/mtr/mtr-glib2.patch deleted file mode 100644 index 76a53fa6f..000000000 --- a/extra/mtr/mtr-glib2.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up mtr-0.83/configure.in.glib2 mtr-0.83/configure.in ---- mtr-0.83/configure.in.glib2 2013-02-18 20:10:00.767417356 +0100 -+++ mtr-0.83/configure.in 2013-02-18 20:10:53.549513018 +0100 -@@ -59,6 +59,8 @@ else - GTK_OBJ="" - fi - -+PKG_CHECK_MODULES([GLIB2], [glib-2.0]) -+ - AC_CHECK_FUNC(socket, , - AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found))) - -diff -up mtr-0.83/Makefile.am.glib2 mtr-0.83/Makefile.am ---- mtr-0.83/Makefile.am.glib2 2013-02-18 20:13:54.635841512 +0100 -+++ mtr-0.83/Makefile.am 2013-02-18 20:16:17.877101679 +0100 -@@ -19,8 +19,9 @@ mtr_SOURCES = mtr.c \ - mtr-gtk.h - EXTRA_mtr_SOURCES = curses.c \ - gtk.c -+AM_CFLAGS = $(GLIB2_CFLAGS) - mtr_DEPENDENCIES = $(GTK_OBJ) $(CURSES_OBJ) --mtr_LDFLAGS = $(GTK_OBJ) $(CURSES_OBJ) -+mtr_LDFLAGS = $(GTK_OBJ) $(GLIB2_LIBS) $(CURSES_OBJ) - - EXTRA_DIST = SECURITY mtr.8 Makefile Makefile.dist - distclean-local: diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD index 9965977de..e4a3d09eb 100644 --- a/extra/nspr/PKGBUILD +++ b/extra/nspr/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 178768 2013-02-26 20:04:47Z ioni $ +# $Id: PKGBUILD 182378 2013-04-09 18:38:44Z ioni $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=nspr -pkgver=4.9.5 +pkgver=4.9.6 pkgrel=1 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64 'mips64el') @@ -13,7 +13,7 @@ makedepends=('zip') options=(!emptydirs) source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz nspr.pc.in) -md5sums=('b6ccfa8fcbbeb17ebeb19a3edff612bd' +md5sums=('62b1e9d376d503d972f90c3c0031d879' 'bce1611f3117b53fc904cab549c09967') build() { diff --git a/extra/orc/PKGBUILD b/extra/orc/PKGBUILD index d255faed6..6305e6ed3 100644 --- a/extra/orc/PKGBUILD +++ b/extra/orc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 149305 2012-02-06 18:30:33Z ibiru $ +# $Id: PKGBUILD 182380 2013-04-09 18:42:44Z ioni $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=orc -pkgver=0.4.16 -pkgrel=1.2 +pkgver=0.4.17 +pkgrel=1 pkgdesc="The Oild Runtime Compiler" arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -10,7 +10,7 @@ url="http://code.entropywave.com/projects/orc/" depends=('glibc') options=('!libtool') source=(http://code.entropywave.com/download/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('e482932e544c847761449b106ecbc483') +md5sums=('af1bf3dab9e69f3c36f389285e2a12a1') build () { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD index 6a0a5d153..0696da080 100644 --- a/extra/python-lxml/PKGBUILD +++ b/extra/python-lxml/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 178116 2013-02-16 16:58:25Z angvp $ +# $Id: PKGBUILD 182348 2013-04-08 19:02:16Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> pkgbase=python-lxml pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs') -pkgver=3.1.0 +pkgver=3.1.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('BSD' 'custom') url="http://lxml.de/" makedepends=('python2' 'python' 'libxslt') source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc}) -md5sums=('df70163fb581bbe45fdcd6069a503273' - 'e84737c92c90c9f71a5118b5e1ad5e91') +md5sums=('3f185d8cdcd6b8934c67f9b0356aab33' + 'b90760fa4bf235a1f0e1a8252e1c8545') check() { cd lxml-$pkgver diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD index bd363b1d6..5ebc686fd 100644 --- a/extra/python/PKGBUILD +++ b/extra/python/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 173845 2012-12-25 00:34:33Z foutrelis $ +# $Id: PKGBUILD 182150 2013-04-08 10:27:25Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=python -pkgver=3.3.0 -pkgrel=3.1 +pkgver=3.3.1 +pkgrel=1 _pybasever=3.3 pkgdesc="Next generation of the python high-level scripting language" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ provides=('python3') replaces=('python3') options=('!makeflags') source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz) -sha1sums=('833d73565e1b665f1878504081dc985a5a06e46a') +sha1sums=('393d7302c48bc911cd7faa7fa9b5fbcb9919bddc') build() { cd "${srcdir}/Python-${pkgver}" diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD index 29fddd125..11562e06f 100644 --- a/extra/python2/PKGBUILD +++ b/extra/python2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 173846 2012-12-25 00:34:35Z foutrelis $ +# $Id: PKGBUILD 182151 2013-04-08 10:27:26Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributer: Allan McRae <allan@archlinux.org> # Contributer: Jason Chu <jason@archlinux.org> pkgname=python2 -pkgver=2.7.3 -pkgrel=4.1 +pkgver=2.7.4 +pkgrel=1 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ optdepends=('tk: for IDLE') conflicts=('python<3') options=('!makeflags') source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz) -sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357') +sha1sums=('08e78ebeb6d9c799644f6d787ca424291c0fe03e') build() { cd "${srcdir}/Python-${pkgver}" @@ -32,6 +32,9 @@ build() { # FS#23997 sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py + sed -i "s/python2.3/python2/g" Lib/distutils/tests/test_build_scripts.py \ + Lib/distutils/tests/test_install_scripts.py Tools/scripts/gprof2html.py + # Ensure that we are using the system copy of various libraries (expat, zlib and libffi), # rather than copies shipped in the tarball rm -r Modules/expat @@ -50,21 +53,23 @@ package() { cd "${srcdir}/Python-${pkgver}" make DESTDIR="${pkgdir}" altinstall maninstall - ln -sf python${_pybasever} "${pkgdir}/usr/bin/python2" - ln -sf python${_pybasever}-config "${pkgdir}/usr/bin/python2-config" - ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python2.1" + rm "${pkgdir}"/usr/share/man/man1/python.1 + + ln -sf python${_pybasever} "${pkgdir}"/usr/bin/python2 + ln -sf python${_pybasever}-config "${pkgdir}"/usr/bin/python2-config + ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python2.1 + + # FS#33954 + ln -sf python-${_pybasever}.pc "${pkgdir}"/usr/lib/pkgconfig/python2.pc - ln -sf ../../libpython${_pybasever}.so \ - "${pkgdir}/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so" + ln -sf ../../libpython${_pybasever}.so "${pkgdir}"/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so - mv "${pkgdir}/usr/bin/smtpd.py" "${pkgdir}/usr/lib/python${_pybasever}/" + mv "${pkgdir}"/usr/bin/smtpd.py "${pkgdir}"/usr/lib/python${_pybasever}/ # some useful "stuff" install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts} - install -m755 Tools/i18n/{msgfmt,pygettext}.py \ - "${pkgdir}/usr/lib/python${_pybasever}/Tools/i18n/" - install -m755 Tools/scripts/{README,*py} \ - "${pkgdir}/usr/lib/python${_pybasever}/Tools/scripts/" + install -m755 Tools/i18n/{msgfmt,pygettext}.py "${pkgdir}"/usr/lib/python${_pybasever}/Tools/i18n/ + install -m755 Tools/scripts/{README,*py} "${pkgdir}"/usr/lib/python${_pybasever}/Tools/scripts/ # fix conflicts with python mv "${pkgdir}"/usr/bin/idle{,2} @@ -72,13 +77,12 @@ package() { mv "${pkgdir}"/usr/bin/2to3{,-2.7} # clean up #!s - find "${pkgdir}/usr/lib/python${_pybasever}/" -name '*.py' | \ + find "${pkgdir}"/usr/lib/python${_pybasever}/ -name '*.py' | \ xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" # clean-up reference to build directory - sed -i "s#${srcdir}/Python-${pkgver}:##" \ - "${pkgdir}/usr/lib/python${_pybasever}/config/Makefile" + sed -i "s#${srcdir}/Python-${pkgver}:##" "${pkgdir}"/usr/lib/python${_pybasever}/config/Makefile # license - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD index 5adeb9906..835e5f3b8 100644 --- a/extra/qt3/PKGBUILD +++ b/extra/qt3/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 180688 2013-03-25 19:15:40Z bpiotrowski $ +# $Id: PKGBUILD 182387 2013-04-09 21:20:53Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=qt3 pkgver=3.3.8b -pkgrel=3 +pkgrel=4 epoch=1 -pkgdesc="The QT3 gui toolkit" +pkgdesc="A cross-platform application and UI framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.trolltech.com/products/qt/index.html" license=('GPL') depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'glu' 'libxft' 'libxrandr' 'libmng') makedepends=('mariadb' 'postgresql' 'unixodbc' 'sqlite' 'mesa') -optdepends=('libmariadbclient' 'postgresql-libs' 'unixodbc') -options=('!libtool') -install=qt.install +optdepends=('libmariadbclient: MariaDB driver' + 'postgresql-libs: PostgreSQL driver' + 'unixodbc: ODBC driver') +options=('!libtool' '!docs') source=(ftp://ftp.qt-project.org/qt/source/qt-x11-free-${pkgver}.tar.gz - qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 + qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2 eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch) sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854' - 'd2e257a9011208b2cb81b9cf47915b9a2f9dab83' '3d19510c46016a1a211d97bf8f82b01498b1b33c' '33418e5b117458af23c72cdbffc0c339bc34bdc4' '116afa0e737bdf27ea27f9b3653aeb56db9ec151' @@ -31,11 +31,11 @@ sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854' # other qt-patches come from fedora and gentoo build() { - unset QMAKESPEC export QTDIR="${srcdir}"/qt-x11-free-${pkgver} export PATH=${QTDIR}/bin:${PATH} export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} export QMAKESPEC=$QTDIR/mkspecs/linux-g++ + cd "${srcdir}"/qt-x11-free-${pkgver} # apply qt patches from kde.org for i in ../qt-copy-kde-patches/*; do @@ -51,27 +51,25 @@ build() { patch -p1 -i "${srcdir}"/qt-odbc.patch # fix build with gcc 4.6.0 patch -p1 -i "${srcdir}"/gcc-4.6.patch - patch -p0 -i "${srcdir}"/qt3-png15.patch - # start compiling qt - sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix - rm -rf doc/html examples tutorial - sed -i "s|sub-tutorial sub-examples||" Makefile - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf - sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf + + sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++{,-32,-64}/qmake.conf sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix sed -i "s|read acceptance|acceptance=yes|" configure - # remove unwanted mkspecs - rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} - if [ "$CARCH" = "x86_64" ]; then export ARCH="-64" else unset ARCH fi - ./configure -prefix /opt/qt \ + ./configure \ + -prefix /usr \ + -bindir /usr/lib/qt3/bin \ + -headerdir /usr/include/qt3 \ + -plugindir /usr/lib/qt3/plugins \ + -datadir /usr/share/qt3 \ + -translationdir /usr/share/qt3/translations \ + -I/usr/include/mysql -I/usr/include/postgresql/server \ -platform linux-g++$ARCH \ -system-zlib \ -qt-gif \ @@ -85,40 +83,26 @@ build() { -no-g++-exceptions \ -plugin-sql-{mysql,psql,sqlite,odbc} - # fix /opt/qt/lib path - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile - [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile - - cd "${srcdir}"/qt-x11-free-${pkgver} - make -C qmake - cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql - "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro - cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql - "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro - - cd "${srcdir}"/qt-x11-free-${pkgver} - # fix the broken makefiles - #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile make } package() { cd "${srcdir}"/qt-x11-free-${pkgver} make INSTALL_ROOT="${pkgdir}" install - rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations} - sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl - install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake - install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh - ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config - rm -f "${pkgdir}"/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH + sed -i -e "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" -e "s|${srcdir}/||g" "${pkgdir}"/usr/lib/*.prl + rm -rf "${pkgdir}"/usr/share/qt3/{phrasebooks,templates,translations} + rm -rf "${pkgdir}"/usr/share/qt3/mkspecs/{aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,linux-g++$ARCH/linux-g++$ARCH,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*} - # install man pages - install -d -m755 "${pkgdir}"/opt/qt/man - cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/ +# install man pages + install -d -m755 "${pkgdir}"/usr/share/man + cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/usr/share/man/ + for i in "${pkgdir}"/usr/share/man/man1/*; do + mv $i ${i%.*}-qt3.1 + done - install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/ - echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf +# Useful symlinks for cmake and configure scripts + install -d "${pkgdir}"/usr/bin + for b in "${pkgdir}"/usr/lib/qt3/bin/*; do + ln -s /usr/lib/qt3/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt3 + done } diff --git a/extra/qt3/qt.install b/extra/qt3/qt.install deleted file mode 100644 index 6d042daae..000000000 --- a/extra/qt3/qt.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - post_remove -} - -post_upgrade() { - post_remove -} - -post_remove() { - # this can be removed in future versions - sed -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf -} diff --git a/extra/qt3/qt.profile b/extra/qt3/qt.profile deleted file mode 100644 index ed4d232ae..000000000 --- a/extra/qt3/qt.profile +++ /dev/null @@ -1,4 +0,0 @@ -export QTDIR=/opt/qt -export QT_XFT=true -export PATH=$PATH:$QTDIR/bin -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index eabd02224..a8fc7e654 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178746 2013-02-26 16:27:02Z tpowa $ +# $Id: PKGBUILD 182410 2013-04-10 07:43:35Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Simo L. <neotuli@yahoo.com> @@ -6,14 +6,13 @@ pkgname=sane pkgver=1.0.23 -pkgrel=3 +pkgrel=4 pkgdesc="Scanner Access Now Easy" url="http://www.sane-project.org/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusb-compat' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp') makedepends=('texlive-latexextra') -install=$pkgname.install backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus48u.conf,avision.conf,bh.conf,canon.conf,canon630u.conf,canon_dr.conf,canon_pp.conf,cardscan.conf,coolscan2.conf,coolscan3.conf,coolscan.conf,dc25.conf,dc210.conf,dc240.conf,dell1600n_net.conf,dll.conf,dmc.conf,epjitsu.conf,epson.conf,epson2.conf,fujitsu.conf,genesys.conf,gphoto2.conf,gt68xx.conf,hp.conf,hp3900.conf,hp4200.conf,hp5400.conf,hpsj5s.conf,hs2p.conf,ibm.conf,kodak.conf,kodakaio.conf,leo.conf,lexmark.conf,ma1509.conf,magicolor.conf,matsushita.conf,microtek.conf,microtek2.conf,mustek.conf,mustek_pp.conf,mustek_usb.conf,nec.conf,net.conf,p5.conf,pie.conf,pixma.conf,plustek.conf,plustek_pp.conf,qcam.conf,ricoh.conf,rts8891.conf,s9036.conf,saned.conf,sceptre.conf,sharp.conf,sm3840.conf,snapscan.conf,sp15c.conf,st400.conf,stv680.conf,tamarack.conf,teco1.conf,teco2.conf,teco3.conf,test.conf,u12.conf,umax.conf,umax1220u.conf,umax_pp.conf,xerox_mfp.conf,v4l.conf} etc/xinetd.d/sane) source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz 'sane.xinetd' @@ -23,13 +22,17 @@ source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz 'network.patch') options=(!libtool) -build() { +prepare() { cd "${srcdir}/${pkgname}-backends-${pkgver}" # fix FS#33657 patch -Np0 -i ${srcdir}/kodakaio.c.patch # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186 patch -Np1 -i ${srcdir}/network.patch +} + +build() { + cd "${srcdir}/${pkgname}-backends-${pkgver}" ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/sane/sane.install b/extra/sane/sane.install deleted file mode 100644 index 5ec361eea..000000000 --- a/extra/sane/sane.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - /bin/cat <<THEEND -NOTE ----- -Add your user to group 'scanner' to use scanner devices. -THEEND -} diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD index 2ea8d4ec2..7a8e1502c 100644 --- a/extra/telepathy-kde-accounts-kcm/PKGBUILD +++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182013 2013-04-05 09:10:49Z andrea $ +# $Id: PKGBUILD 182124 2013-04-08 00:32:17Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> @@ -18,7 +18,7 @@ groups=('kde-telepathy') conflicts=('telepathy-kde-accounts-kcm-plugins') replaces=('telepathy-kde-accounts-kcm-plugins') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('4cf25b693b2eee1a053c6f664cd21954b8b85eba') +sha1sums=('8951573b54d5d940687c3c2b7b77fb441b0fddd9') build() { mkdir build diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD index dc52f5e1f..f05c8b861 100644 --- a/extra/telepathy-kde-approver/PKGBUILD +++ b/extra/telepathy-kde-approver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182014 2013-04-05 09:10:51Z andrea $ +# $Id: PKGBUILD 182126 2013-04-08 00:43:14Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> @@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('e2495dea55af94dc6cbc41ae37690126e595d614') +sha1sums=('340cd26c37297540c0f70e75adbb43bcab0889c7') build() { mkdir build diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD index 3cf838be0..8947bb6ca 100644 --- a/extra/telepathy-kde-auth-handler/PKGBUILD +++ b/extra/telepathy-kde-auth-handler/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182015 2013-04-05 09:10:53Z andrea $ +# $Id: PKGBUILD 182128 2013-04-08 00:45:51Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-auth-handler @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('18817f0dfb506bc2800e7179ca184ff7929f558d') +sha1sums=('392ee2e0146e445950ecad1b0cae27ece77b7a3e') build() { mkdir build diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD index 22dc8ea66..c6c601506 100644 --- a/extra/telepathy-kde-common-internals/PKGBUILD +++ b/extra/telepathy-kde-common-internals/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182016 2013-04-05 09:10:55Z andrea $ +# $Id: PKGBUILD 182129 2013-04-08 00:46:52Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-common-internals @@ -13,7 +13,7 @@ depends=('kdelibs' 'telepathy-qt' 'telepathy-mission-control') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('b5201215a068a46457d07c6c01365cc5df15c6c8') +sha1sums=('93ef0f8498c44b86dc25539f0b4f55354dc566ec') build() { mkdir build diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD index 30162f1a1..bae5f452d 100644 --- a/extra/telepathy-kde-contact-list/PKGBUILD +++ b/extra/telepathy-kde-contact-list/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182017 2013-04-05 09:10:57Z andrea $ +# $Id: PKGBUILD 182131 2013-04-08 00:47:59Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('763aa6d32bd780fc82cb64737232d8afaef6d895') +sha1sums=('2cb4bf8f7b5df1660027eab606d513b9cccebad5') build() { mkdir build diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD index 346126b6a..0f62878a2 100644 --- a/extra/telepathy-kde-contact-runner/PKGBUILD +++ b/extra/telepathy-kde-contact-runner/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182018 2013-04-05 09:10:59Z andrea $ +# $Id: PKGBUILD 182133 2013-04-08 00:48:26Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-contact-runner @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('6d89ffbcbec4390f7bfcec42bdaa1c732efae1a2') +sha1sums=('576642c35f2d03b7859e15a004590ed6cc321ebd') build() { mkdir build diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD index b653a261f..4e240e467 100644 --- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD +++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182020 2013-04-05 09:11:03Z andrea $ +# $Id: PKGBUILD 182135 2013-04-08 00:49:01Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-filetransfer-handler @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('2e41fa30b936360bf65cb9c256527878f1ef2305') +sha1sums=('6c061a13f483fd14d3ef184d1008e4f8002e46a8') build() { mkdir build diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD index 91031f197..7b9f3f293 100644 --- a/extra/telepathy-kde-integration-module/PKGBUILD +++ b/extra/telepathy-kde-integration-module/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182021 2013-04-05 09:11:05Z andrea $ +# $Id: PKGBUILD 182137 2013-04-08 00:49:44Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-integration-module @@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals') makedepends=('cmake' 'automoc4') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('8d0c37001aec7dfa01349ae943ff28a8270dfbac') +sha1sums=('eb1fc514199587b018036bc307d385766fc40094') build() { mkdir build diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD index be3c70de2..775bf6534 100644 --- a/extra/telepathy-kde-send-file/PKGBUILD +++ b/extra/telepathy-kde-send-file/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182022 2013-04-05 09:11:06Z andrea $ +# $Id: PKGBUILD 182139 2013-04-08 00:50:17Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-kde-send-file @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') groups=('kde-telepathy') install=${pkgname}.install source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('91673a581d50dde9ad41d8e32d08f69d7410a5a6') +sha1sums=('bc3b7832c88a866b396d5358c20c3a1f3a0048d2') build() { mkdir build diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD index 652d7f60c..ebe0e20a5 100644 --- a/extra/telepathy-kde-text-ui/PKGBUILD +++ b/extra/telepathy-kde-text-ui/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182023 2013-04-05 09:11:08Z andrea $ +# $Id: PKGBUILD 182141 2013-04-08 00:51:21Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Laurent Carlier <lordheavym@gmail.com> @@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list' 'telepathy-logger-qt') makedepends=('cmake' 'automoc4' 'boost') groups=('kde-telepathy') source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('bd55810ebe781319c5427f6d4eae4a1cb7d1fadd') +sha1sums=('87a519f132cc338b7f1f47aa8997e89f9f566bfd') build() { mkdir build diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD index 8a743571a..cef6f3c74 100644 --- a/extra/twisted/PKGBUILD +++ b/extra/twisted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 174290 2013-01-03 23:54:14Z eric $ +# $Id: PKGBUILD 182404 2013-04-10 06:49:54Z eric $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=twisted -pkgver=12.3.0 +pkgver=13.0.0 pkgrel=1 pkgdesc="Asynchronous networking framework written in Python" arch=('i686' 'x86_64' 'mips64el') @@ -18,20 +18,23 @@ optdepends=('python2-pyopenssl' 'tk: for using tkconch') install=twisted.install source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2) -sha1sums=('921bef9a560edd14ea2b559ac0d674f4dac4fd65') +sha1sums=('5c66a4f231a5f3e17860a41498ac80e76a156dca') + +prepare() { + cd "Twisted-$pkgver" + sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \ + twisted/python/test/pullpipe.py \ + twisted/mail/test/pop3testserver.py \ + twisted/trial/test/scripttest.py +} build() { - cd "$srcdir/Twisted-$pkgver" + cd "Twisted-$pkgver" python2 setup.py build } package() { - cd "$srcdir/Twisted-$pkgver" + cd "Twisted-$pkgver" python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1 install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \ - "$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py \ - "$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py \ - "$pkgdir"/usr/lib/python2.7/site-packages/twisted/python/test/pullpipe.py } diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index a06a7b34e..a8ab46e88 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180898 2013-03-27 20:10:16Z guillaume $ +# $Id: PKGBUILD 182353 2013-04-08 21:34:41Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=2.0.5 -pkgrel=5 +pkgver=2.0.6 +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -61,7 +61,7 @@ backup=('usr/share/vlc/lua/http/.hosts' options=('!libtool' '!emptydirs') install=vlc.install source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") -md5sums=('4f959c0766ada8cea5a72c65fce94ebe') +md5sums=('b45be633c71dca04ca7d6c3d64dd728b') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 9fa9d3913..19c5ed42f 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180518 2013-03-22 13:51:11Z andyrtr $ +# $Id: PKGBUILD 182343 2013-04-08 15:23:26Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.5 +pkgver=2.21.6 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('0fd8265039bee8f8533e8bac4df8ba8f67a65a4e78763a4982980309b05fd954') +sha256sums=('c3ef371e72544350c878d5373b2e7f49b8a0e253f9b63cb1ce2881180b45f8d9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD new file mode 100644 index 000000000..e68d8b5ed --- /dev/null +++ b/extra/xulrunner/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 182413 2013-04-10 13:01:03Z foutrelis $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Alexander Baldeck <alexander@archlinux.org> +pkgname=xulrunner +pkgver=20.0 +pkgrel=1 +pkgdesc="Mozilla Runtime Environment" +arch=('i686' 'x86_64') +license=('MPL' 'GPL' 'LGPL') +depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13') +url="http://wiki.mozilla.org/XUL:Xul_Runner" +source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2 + mozconfig + mozilla-pkgconfig.patch + shared-libs.patch) +options=('!emptydirs') +replaces=('xulrunner-oss') +md5sums=('1b8a1907919eb805f390a05216f2d8d0' + 'f26710bcf3e65699a0646c47155cb147' + '27271ce647a83906ef7a24605e840d61' + '52e52f840a49eb1d14be1c0065b03a93') + +prepare() { + cd "$srcdir/mozilla-release" + cp "$srcdir/mozconfig" .mozconfig + + #fix libdir/sdkdir - fedora + patch -Np1 -i ../mozilla-pkgconfig.patch + patch -Np1 -i ../shared-libs.patch + + # WebRTC build tries to execute "python" and expects Python 2 + # Workaround taken from chromium PKGBUILD + mkdir "$srcdir/python2-path" + ln -s /usr/bin/python2 "$srcdir/python2-path/python" + + # configure script misdetects the preprocessor without an optimization level + # https://bugs.archlinux.org/task/34644 + sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure +} + +build() { + cd "$srcdir/mozilla-release" + + export PATH="$srcdir/python2-path:$PATH" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" + export PYTHON="/usr/bin/python2" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" +} + +package() { + cd "$srcdir/mozilla-release" + make -j1 -f client.mk DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation" + + # add xulrunner library path to ld.so.conf + install -d $pkgdir/etc/ld.so.conf.d + echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf + + chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" + sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \ + "$pkgdir"/usr/lib/xulrunner-devel-$pkgver/sdk/bin/{xpt,header,typelib,xpidl}.py +} diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig new file mode 100644 index 000000000..6679dac21 --- /dev/null +++ b/extra/xulrunner/mozconfig @@ -0,0 +1,29 @@ +. $topsrcdir/xulrunner/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +#ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-startup-notification +#ac_add_options --enable-gstreamer + +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-installer diff --git a/extra/xulrunner/mozilla-pkgconfig.patch b/extra/xulrunner/mozilla-pkgconfig.patch new file mode 100644 index 000000000..037d4aee0 --- /dev/null +++ b/extra/xulrunner/mozilla-pkgconfig.patch @@ -0,0 +1,40 @@ +diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:11:38.100005674 +0000 ++++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:14:35.095147521 +0000 +@@ -6,5 +6,6 @@ + Name: libxul-embedding + Description: Static library for version-independent embedding of the Mozilla runtime + Version: %MOZILLA_VERSION% ++Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib -lxpcomglue -ldl + Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% +diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19 22:14:04.375412141 +0000 +@@ -1,5 +1,6 @@ + prefix=%prefix% + sdkdir=%sdkdir% ++libdir=%libdir% + includedir=%includedir% + idldir=%idldir% + +diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in +--- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19 22:18:28.743135321 +0000 +@@ -108,6 +108,7 @@ + -e "s|%includedir%|$(includedir)|" \ + -e "s|%idldir%|$(idldir)|" \ + -e "s|%sdkdir%|$(sdkdir)|" \ ++ -e "s|%libdir%|$(installdir)|" \ + -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ + -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ + -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ +diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in +--- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:18:55.569571004 +0000 +@@ -7,4 +7,4 @@ + Version: %MOZILLA_VERSION% + Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib %MOZ_JS_LINK% +-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE ++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE diff --git a/extra/xulrunner/shared-libs.patch b/extra/xulrunner/shared-libs.patch new file mode 100644 index 000000000..1f22b2b0d --- /dev/null +++ b/extra/xulrunner/shared-libs.patch @@ -0,0 +1,12 @@ +diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in +--- mozilla-release.orig/browser/installer/Makefile.in 2012-07-17 16:19:29.480356991 +0000 ++++ mozilla-release/browser/installer/Makefile.in 2012-07-17 17:32:41.250937293 +0000 +@@ -50,7 +50,7 @@ + MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in + # Some files have been already bundled with xulrunner + ifndef SYSTEM_LIBXUL +-MOZ_PKG_FATAL_WARNINGS = 1 ++MOZ_PKG_FATAL_WARNINGS = 0 + endif + + MOZ_NONLOCALIZED_PKG_LIST = \ |