From c7cb603f86b4d4fb6567e3faa15b916a306f7004 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 3 Apr 2012 00:01:35 +0000 Subject: Tue Apr 3 00:01:35 UTC 2012 --- community-staging/fatrat/PKGBUILD | 4 +- community-staging/libfbclient/ChangeLog | 26 + community-staging/libfbclient/LICENSE | 44 + community-staging/libfbclient/PKGBUILD | 41 + community-staging/openttd/PKGBUILD | 39 + community-staging/openttd/openttd.install | 17 + community-staging/pion-net/PKGBUILD | 21 +- .../contacts/0001-Fix-Makefile-whitespace.patch | 19 + community-testing/contacts/PKGBUILD | 34 + community-testing/contacts/contacts.install | 24 + .../dates/0001-Fix-FTBFS-with-newer-GCC.patch | 39 + .../dates/0001-Fix-Makefile-whitespace.patch | 20 + ...e-calls-to-the-deprecated-functions-e_sou.patch | 155 ++ community-testing/dates/PKGBUILD | 40 + community-testing/dates/dates.install | 11 + community-testing/lomoco/PKGBUILD | 40 + community-testing/lomoco/lomoco.sh | 21 + community-testing/lomoco/lomoco_mouse.conf | 5 + community-testing/multipath-tools/PKGBUILD | 44 + community-testing/multipath-tools/fix-build.patch | 140 ++ .../multipath-tools/multipath-tools.install | 4 + community-testing/multipath-tools/multipath.conf | 8 + .../multipath-tools/multipath.conf.annotated | 362 +++++ community-testing/multipath-tools/multipathd.rc | 35 + community-testing/usb_modeswitch/PKGBUILD | 41 + community/e-modules-extra-svn/PKGBUILD | 8 +- community/e-svn/PKGBUILD | 4 +- community/e_dbus-svn/PKGBUILD | 4 +- community/ecore-svn/PKGBUILD | 4 +- community/edje-svn/PKGBUILD | 4 +- community/eet-svn/PKGBUILD | 4 +- community/eeze-svn/PKGBUILD | 4 +- community/efreet-svn/PKGBUILD | 4 +- community/eina-svn/PKGBUILD | 4 +- community/elementary-svn/PKGBUILD | 4 +- community/embryo-svn/PKGBUILD | 4 +- community/emprint-svn/PKGBUILD | 2 +- community/esdl/PKGBUILD | 17 +- community/evas-svn/PKGBUILD | 4 +- community/lxdm/PKGBUILD | 23 +- community/lxdm/glib2-2.32.0.patch | 21 + community/lxdm/lxdm-pam | 8 + community/lxdm/lxdm.conf.patch | 11 + community/ristretto/PKGBUILD | 6 +- community/sakura/PKGBUILD | 13 +- community/wings3d/PKGBUILD | 55 + community/wings3d/wings3d | 2 + community/wings3d/wings3d.install | 14 + community/wings3d/wings3d.png | Bin 0 -> 5838 bytes extra/cups-filters/PKGBUILD | 42 + extra/fftw/PKGBUILD | 8 +- extra/openal/PKGBUILD | 14 +- extra/p11-kit/PKGBUILD | 6 +- extra/qrencode/PKGBUILD | 8 +- extra/stellarium/PKGBUILD | 6 +- extra/texmacs/PKGBUILD | 11 +- extra/texmacs/texmacs.install | 14 + extra/wxmaxima/PKGBUILD | 9 +- extra/wxmaxima/wxmaxima.install | 14 + extra/xfig/PKGBUILD | 11 +- extra/xorg-server/PKGBUILD | 10 +- extra/xorg-server/autoconfig-nvidia.patch | 12 +- extra/xorg-server/autoconfig-sis.patch | 18 +- extra/xorg-xlsatoms/PKGBUILD | 8 +- extra/xorg-xpr/PKGBUILD | 15 +- extra/xorg-xwud/PKGBUILD | 8 +- libre/abiword-libre/PKGBUILD | 88 ++ libre/abiword-libre/abiword-2.8.6-libpng15.patch | 100 ++ .../abiword-libre/abiword-2.8.6-no-undefined.patch | 21 + libre/abiword-libre/abiword-libre.install | 11 + libre/abiword-libre/compat_libwpg_0_9.patch | 371 +++++ libre/abiword-libre/liberation-fonts.patch | 1606 ++++++++++++++++++++ libre/iceweasel-i18n/Makefile | 59 + libre/iceweasel-i18n/PKGBUILD | 142 ++ libre/iceweasel-i18n/PKGBUILD.in | 63 + libre/iceweasel-libre/PKGBUILD | 156 ++ libre/iceweasel-libre/iceweasel-install-dir.patch | 28 + libre/iceweasel-libre/iceweasel.install | 13 + libre/iceweasel-libre/libre.patch | 242 +++ libre/iceweasel-libre/mozconfig | 55 + libre/iceweasel-libre/mozconfig.pgo | 4 + libre/iceweasel-libre/region.properties | 23 + libre/iceweasel-libre/vendor.js | 9 + libre/iceweasel-libre/xulrunner-copy-stub.patch | 11 + libre/mozilla-searchplugins/PKGBUILD | 40 + libre/mozilla-searchplugins/duck-duck-go-lite.xml | 8 + libre/mozilla-searchplugins/duck-duck-go-ssl.xml | 8 + libre/mozilla-searchplugins/internet-archive.xml | 12 + libre/mozilla-searchplugins/jamendo-en.xml | 12 + libre/mozilla-searchplugins/logless-search.xml | 8 + .../mozilla-searchplugins/scroogle-ssl-english.xml | 14 + libre/mozilla-searchplugins/wikipedia.xml | 15 + libre/mozilla-searchplugins/yacy.xml | 9 + staging/libreoffice/PKGBUILD | 15 +- staging/libreoffice/buildfix_icu49.diff | 42 + staging/php/PKGBUILD | 368 +++++ staging/php/apache.conf | 13 + staging/php/logrotate.d.php-fpm | 6 + staging/php/pcre_info.patch | 43 + staging/php/php-fpm.conf.in.patch | 52 + staging/php/php.ini.patch | 126 ++ staging/php/rc.d.php-fpm | 158 ++ testing/anjuta-extras/PKGBUILD | 28 + testing/anjuta-extras/anjuta-extras.install | 11 + testing/anjuta/PKGBUILD | 34 + testing/anjuta/anjuta.install | 21 + testing/at-spi2-atk/PKGBUILD | 34 + testing/at-spi2-atk/at-spi2-atk.install | 11 + testing/at-spi2-core/PKGBUILD | 33 + testing/atk/PKGBUILD | 26 + testing/baobab/PKGBUILD | 28 + testing/baobab/baobab.install | 12 + testing/bluez/PKGBUILD | 6 +- testing/brasero/PKGBUILD | 38 + testing/brasero/brasero.install | 14 + testing/cairo/PKGBUILD | 6 +- testing/caribou/PKGBUILD | 36 + testing/caribou/caribou.install | 13 + testing/cheese/PKGBUILD | 35 + testing/cheese/cheese.install | 20 + testing/clutter-gst/PKGBUILD | 30 + testing/clutter-gtk/PKGBUILD | 26 + testing/clutter/PKGBUILD | 28 + testing/cogl/PKGBUILD | 28 + testing/colord/PKGBUILD | 32 + testing/dconf/PKGBUILD | 31 + testing/dconf/dconf.install | 13 + testing/devhelp/PKGBUILD | 34 + testing/devhelp/devhelp.install | 22 + testing/empathy/PKGBUILD | 38 + testing/empathy/empathy.install | 16 + testing/eog-plugins/PKGBUILD | 31 + testing/eog-plugins/eog-plugins.install | 11 + testing/eog/PKGBUILD | 33 + testing/eog/eog.install | 13 + testing/epiphany-extensions/PKGBUILD | 28 + .../epiphany-extensions.install | 12 + testing/epiphany/PKGBUILD | 32 + testing/epiphany/epiphany.install | 13 + testing/evince/PKGBUILD | 36 + testing/evince/evince.install | 13 + testing/evolution-data-server/PKGBUILD | 33 + .../evolution-data-server.install | 11 + testing/evolution-ews/PKGBUILD | 27 + testing/evolution-exchange/PKGBUILD | 33 + .../evolution-exchange/evolution-exchange.install | 17 + testing/evolution-groupwise/PKGBUILD | 32 + testing/evolution/PKGBUILD | 48 + testing/evolution/evolution.install | 24 + testing/farstream/PKGBUILD | 36 + testing/farstream/vp8.patch | 12 + testing/folks/PKGBUILD | 28 + testing/gcalctool/PKGBUILD | 30 + testing/gcalctool/gcalctool.install | 11 + testing/gconf/01_xml-gettext-domain.patch | 362 +++++ testing/gconf/PKGBUILD | 51 + testing/gconf/gconf-merge-schema | 34 + testing/gconf/gconf-reload.patch | 20 + testing/gconf/gconf.install | 20 + testing/gconf/gconfpkg | 50 + testing/gcr/PKGBUILD | 33 + testing/gcr/gcr.install | 14 + testing/gdk-pixbuf2/PKGBUILD | 34 + testing/gdk-pixbuf2/gdk-pixbuf2.install | 11 + testing/gdl/PKGBUILD | 27 + testing/gdm/PKGBUILD | 67 + testing/gdm/fix_external_program_directories.patch | 34 + testing/gdm/gdm | 36 + testing/gdm/gdm-autologin.pam | 18 + testing/gdm/gdm-fingerprint.pam | 18 + testing/gdm/gdm-password.pam | 20 + testing/gdm/gdm-smartcard.pam | 18 + testing/gdm/gdm-vt-allocation-hack.patch | 118 ++ testing/gdm/gdm-welcome.pam | 12 + testing/gdm/gdm.install | 30 + testing/gdm/gdm.pam | 10 + testing/gedit/PKGBUILD | 32 + testing/gedit/gedit.install | 18 + testing/geoclue/PKGBUILD | 39 + testing/geoclue/geoclue-gcc46.patch | 23 + testing/ghex/PKGBUILD | 30 + testing/ghex/ghex.install | 20 + testing/gjs/PKGBUILD | 26 + testing/glade/PKGBUILD | 29 + testing/glade/glade.install | 12 + testing/glib-networking/PKGBUILD | 31 + testing/glib-networking/glib-networking.install | 11 + testing/glib2/PKGBUILD | 43 + testing/glib2/glib2.csh | 1 + testing/glib2/glib2.sh | 1 + testing/glibmm/PKGBUILD | 35 + .../61-gnome-bluetooth-rfkill.rules | 11 + testing/gnome-bluetooth/PKGBUILD | 38 + testing/gnome-bluetooth/gnome-bluetooth.install | 12 + testing/gnome-color-manager/PKGBUILD | 35 + .../gnome-color-manager.install | 19 + testing/gnome-contacts/PKGBUILD | 29 + testing/gnome-contacts/gnome-contacts.install | 11 + testing/gnome-control-center/PKGBUILD | 46 + .../gnome-control-center.install | 11 + .../gnome-control-center/systemd-fallback.patch | 81 + testing/gnome-desktop/PKGBUILD | 30 + testing/gnome-dictionary/PKGBUILD | 28 + testing/gnome-dictionary/gnome-dictionary.install | 11 + testing/gnome-disk-utility/PKGBUILD | 30 + .../gnome-disk-utility/gnome-disk-utility.install | 11 + testing/gnome-documents/PKGBUILD | 35 + testing/gnome-documents/gnome-documents.install | 13 + testing/gnome-font-viewer/PKGBUILD | 28 + .../gnome-font-viewer/gnome-font-viewer.install | 11 + testing/gnome-games/PKGBUILD | 37 + testing/gnome-games/gnome-games.install | 122 ++ testing/gnome-keyring/PKGBUILD | 32 + testing/gnome-keyring/gnome-keyring.install | 12 + testing/gnome-media/PKGBUILD | 38 + testing/gnome-media/gnome-media.install | 22 + testing/gnome-menus/PKGBUILD | 36 + testing/gnome-menus/menus.patch | 25 + testing/gnome-nettool/PKGBUILD | 30 + testing/gnome-nettool/gnome-nettool.install | 12 + testing/gnome-online-accounts/PKGBUILD | 29 + .../gnome-online-accounts.install | 11 + testing/gnome-panel/PKGBUILD | 36 + testing/gnome-panel/gnome-panel.install | 24 + testing/gnome-power-manager/PKGBUILD | 32 + .../gnome-power-manager.install | 12 + testing/gnome-screensaver/PKGBUILD | 37 + .../gnome-screensaver/gnome-screensaver.install | 7 + testing/gnome-screensaver/gnome-screensaver.pam | 3 + testing/gnome-screenshot/PKGBUILD | 29 + testing/gnome-screenshot/gnome-screenshot.install | 11 + testing/gnome-search-tool/PKGBUILD | 34 + .../gnome-search-tool/gnome-search-tool.install | 17 + testing/gnome-session/PKGBUILD | 32 + testing/gnome-session/gnome-session.install | 12 + testing/gnome-settings-daemon/PKGBUILD | 39 + .../gnome-settings-daemon.install | 12 + .../gnome-settings-daemon/systemd-fallback.patch | 154 ++ testing/gnome-shell/PKGBUILD | 33 + testing/gnome-shell/gnome-shell.install | 19 + testing/gnome-system-log/PKGBUILD | 30 + testing/gnome-system-log/gnome-system-log.install | 12 + testing/gnome-system-monitor/PKGBUILD | 29 + .../gnome-system-monitor.install | 19 + testing/gnome-terminal/PKGBUILD | 33 + testing/gnome-terminal/gnome-terminal.install | 17 + testing/gnome-themes-standard/PKGBUILD | 31 + testing/gnome-user-share/PKGBUILD | 33 + testing/gnome-user-share/gnome-user-share.install | 22 + testing/gobject-introspection/PKGBUILD | 29 + testing/gpsd/PKGBUILD | 78 + testing/gpsd/gpsd | 44 + testing/gpsd/gpsd.conf.d | 5 + testing/gpsd/gpsd.install | 16 + testing/grilo-plugins/PKGBUILD | 43 + testing/grilo-plugins/tracker-0.14.patch | 32 + testing/gthumb/PKGBUILD | 43 + testing/gthumb/gthumb.install | 19 + testing/gtk-vnc/PKGBUILD | 40 + testing/gtk3/PKGBUILD | 38 + testing/gtk3/gtk3.install | 16 + testing/gtk3/settings.ini | 2 + testing/gtkhtml4/PKGBUILD | 29 + testing/gtkmm3/PKGBUILD | 38 + testing/gtksourceview3/PKGBUILD | 29 + testing/gucharmap/PKGBUILD | 30 + testing/gucharmap/gucharmap.install | 17 + testing/gvfs/PKGBUILD | 112 ++ testing/gvfs/gvfs-module.install | 7 + testing/gvfs/gvfs-smb.install | 12 + testing/gvfs/gvfs.install | 14 + ...read-configs-from-lib-depmod.d-modprobe.d.patch | 50 + ...code-the-path-to-modules-to-be-lib-module.patch | 93 ++ testing/kmod/PKGBUILD | 22 +- testing/kmod/depmod-search.conf | 2 +- testing/libchamplain/PKGBUILD | 27 + testing/libcroco/PKGBUILD | 26 + testing/libgda/PKGBUILD | 34 + testing/libgda/libgda.install | 12 + testing/libgdata/PKGBUILD | 26 + testing/libgnome-keyring/PKGBUILD | 28 + testing/libgnomekbd/PKGBUILD | 28 + testing/libgnomekbd/libgnomekbd.install | 11 + testing/libgpod/PKGBUILD | 30 + testing/libgweather/PKGBUILD | 40 + testing/libgweather/gettext-not-xml.patch | 532 +++++++ testing/libgweather/libgweather.install | 22 + testing/libgxps/PKGBUILD | 28 + testing/libimobiledevice/PKGBUILD | 33 + testing/libimobiledevice/swig-version-check.patch | 14 + testing/libmtp/PKGBUILD | 26 + ...-sure-gcc-4.7-can-find-usleep-declaration.patch | 28 + testing/libmusicbrainz4/PKGBUILD | 30 + testing/libpeas/PKGBUILD | 32 + testing/libpeas/libpeas.install | 11 + testing/libplist/PKGBUILD | 30 + testing/librsvg/PKGBUILD | 28 + testing/librsvg/librsvg.install | 11 + testing/libsocialweb/PKGBUILD | 35 + testing/libsoup/PKGBUILD | 48 + testing/libwacom/PKGBUILD | 25 + testing/libwebkit/PKGBUILD | 59 + testing/libwnck3/PKGBUILD | 28 + testing/libxklavier/PKGBUILD | 28 + testing/mash/PKGBUILD | 26 + testing/metacity/PKGBUILD | 31 + testing/metacity/metacity.install | 19 + testing/mousetweaks/PKGBUILD | 30 + testing/mousetweaks/mousetweaks.install | 17 + testing/mutter/PKGBUILD | 33 + testing/mutter/mutter.install | 19 + testing/mx/PKGBUILD | 28 + testing/nautilus-sendto/PKGBUILD | 31 + testing/nautilus-sendto/nautilus-sendto.install | 11 + testing/nautilus/PKGBUILD | 34 + testing/nautilus/nautilus.install | 20 + testing/network-manager-applet/PKGBUILD | 41 + .../network-manager-applet.install | 18 + testing/networkmanager-openconnect/PKGBUILD | 31 + .../networkmanager-openconnect.install | 16 + testing/networkmanager-openvpn/PKGBUILD | 31 + .../networkmanager-openvpn.install | 11 + testing/networkmanager-pptp/PKGBUILD | 31 + .../networkmanager-pptp.install | 11 + testing/networkmanager-vpnc/PKGBUILD | 31 + .../networkmanager-vpnc.install | 11 + testing/networkmanager/PKGBUILD | 40 +- testing/networkmanager/dnsmasq-path.patch | 30 + testing/networkmanager/systemd-fallback.patch | 470 ++++++ testing/pango/PKGBUILD | 29 + testing/pango/pango.install | 21 + testing/pcmciautils/PKGBUILD | 7 +- testing/pidgin/PKGBUILD | 112 ++ testing/pidgin/pidgin.install | 11 + testing/pidgin/port-to-farstream-v3.patch | 447 ++++++ testing/pygobject/PKGBUILD | 58 + testing/rhythmbox/PKGBUILD | 38 + testing/rhythmbox/rhythmbox.install | 13 + testing/seahorse/PKGBUILD | 39 + testing/seahorse/seahorse-ssh-askpass.sh | 3 + testing/seahorse/seahorse.install | 13 + testing/sound-juicer/PKGBUILD | 36 + testing/sound-juicer/sound-juicer.install | 24 + testing/sushi/PKGBUILD | 29 + testing/system-config-printer/PKGBUILD | 104 ++ ...close-FIFO-before-ending-sessions-cleanly.patch | 156 ++ ...l-never-follow-symlinks-in-rm_rf_children.patch | 32 + testing/systemd/PKGBUILD | 118 ++ testing/systemd/cpp-compat.patch | 19 + testing/systemd/os-release | 5 + testing/systemd/systemd.install | 54 + testing/telepathy-farstream/PKGBUILD | 34 + testing/telepathy-gabble/PKGBUILD | 31 + testing/telepathy-gabble/telepathy-gabble.install | 13 + testing/telepathy-glib/PKGBUILD | 31 + testing/telepathy-haze/PKGBUILD | 28 + testing/telepathy-haze/telepathy-haze.install | 13 + testing/telepathy-mission-control/PKGBUILD | 33 + .../telepathy-mission-control.install | 11 + testing/telepathy-qt4/PKGBUILD | 34 + testing/telepathy-qt4/gcc47.patch | 36 + testing/tomboy/PKGBUILD | 37 + testing/tomboy/tomboy.install | 25 + testing/totem-plparser/PKGBUILD | 30 + testing/totem/PKGBUILD | 76 + testing/totem/browser-plugins.ini | 2 + testing/totem/totem.install | 13 + testing/tracker/PKGBUILD | 84 + testing/tracker/tracker.install | 13 + ...sr-always-read-config-files-from-lib-udev.patch | 80 + testing/udev/0002-reinstate-TIMEOUT-handling.patch | 146 ++ testing/udev/PKGBUILD | 39 +- testing/udev/initcpio-install-udev | 6 +- testing/udisks/PKGBUILD | 33 + testing/udisks2/PKGBUILD | 30 + testing/vala/PKGBUILD | 27 + testing/vinagre/PKGBUILD | 35 + testing/vinagre/vinagre.install | 20 + testing/vino/PKGBUILD | 34 + testing/vino/vino.install | 18 + testing/vte3/PKGBUILD | 42 + testing/xdg-user-dirs-gtk/PKGBUILD | 30 + testing/xdg-user-dirs-gtk/lxde.patch | 15 + testing/yelp/PKGBUILD | 31 + testing/yelp/yelp.install | 13 + testing/zenity/PKGBUILD | 26 + 386 files changed, 15519 insertions(+), 203 deletions(-) create mode 100644 community-staging/libfbclient/ChangeLog create mode 100644 community-staging/libfbclient/LICENSE create mode 100644 community-staging/libfbclient/PKGBUILD create mode 100644 community-staging/openttd/PKGBUILD create mode 100644 community-staging/openttd/openttd.install create mode 100644 community-testing/contacts/0001-Fix-Makefile-whitespace.patch create mode 100644 community-testing/contacts/PKGBUILD create mode 100644 community-testing/contacts/contacts.install create mode 100644 community-testing/dates/0001-Fix-FTBFS-with-newer-GCC.patch create mode 100644 community-testing/dates/0001-Fix-Makefile-whitespace.patch create mode 100644 community-testing/dates/0001-Replaced-the-calls-to-the-deprecated-functions-e_sou.patch create mode 100644 community-testing/dates/PKGBUILD create mode 100644 community-testing/dates/dates.install create mode 100644 community-testing/lomoco/PKGBUILD create mode 100644 community-testing/lomoco/lomoco.sh create mode 100644 community-testing/lomoco/lomoco_mouse.conf create mode 100644 community-testing/multipath-tools/PKGBUILD create mode 100644 community-testing/multipath-tools/fix-build.patch create mode 100644 community-testing/multipath-tools/multipath-tools.install create mode 100644 community-testing/multipath-tools/multipath.conf create mode 100644 community-testing/multipath-tools/multipath.conf.annotated create mode 100644 community-testing/multipath-tools/multipathd.rc create mode 100644 community-testing/usb_modeswitch/PKGBUILD create mode 100644 community/lxdm/glib2-2.32.0.patch create mode 100644 community/lxdm/lxdm-pam create mode 100644 community/lxdm/lxdm.conf.patch create mode 100644 community/wings3d/PKGBUILD create mode 100644 community/wings3d/wings3d create mode 100644 community/wings3d/wings3d.install create mode 100644 community/wings3d/wings3d.png create mode 100644 extra/cups-filters/PKGBUILD create mode 100644 extra/texmacs/texmacs.install create mode 100644 extra/wxmaxima/wxmaxima.install create mode 100644 libre/abiword-libre/PKGBUILD create mode 100644 libre/abiword-libre/abiword-2.8.6-libpng15.patch create mode 100644 libre/abiword-libre/abiword-2.8.6-no-undefined.patch create mode 100644 libre/abiword-libre/abiword-libre.install create mode 100644 libre/abiword-libre/compat_libwpg_0_9.patch create mode 100644 libre/abiword-libre/liberation-fonts.patch create mode 100644 libre/iceweasel-i18n/Makefile create mode 100644 libre/iceweasel-i18n/PKGBUILD create mode 100644 libre/iceweasel-i18n/PKGBUILD.in create mode 100644 libre/iceweasel-libre/PKGBUILD create mode 100644 libre/iceweasel-libre/iceweasel-install-dir.patch create mode 100644 libre/iceweasel-libre/iceweasel.install create mode 100644 libre/iceweasel-libre/libre.patch create mode 100644 libre/iceweasel-libre/mozconfig create mode 100644 libre/iceweasel-libre/mozconfig.pgo create mode 100644 libre/iceweasel-libre/region.properties create mode 100644 libre/iceweasel-libre/vendor.js create mode 100644 libre/iceweasel-libre/xulrunner-copy-stub.patch create mode 100644 libre/mozilla-searchplugins/PKGBUILD create mode 100644 libre/mozilla-searchplugins/duck-duck-go-lite.xml create mode 100644 libre/mozilla-searchplugins/duck-duck-go-ssl.xml create mode 100644 libre/mozilla-searchplugins/internet-archive.xml create mode 100644 libre/mozilla-searchplugins/jamendo-en.xml create mode 100644 libre/mozilla-searchplugins/logless-search.xml create mode 100644 libre/mozilla-searchplugins/scroogle-ssl-english.xml create mode 100644 libre/mozilla-searchplugins/wikipedia.xml create mode 100644 libre/mozilla-searchplugins/yacy.xml create mode 100644 staging/libreoffice/buildfix_icu49.diff create mode 100644 staging/php/PKGBUILD create mode 100644 staging/php/apache.conf create mode 100644 staging/php/logrotate.d.php-fpm create mode 100644 staging/php/pcre_info.patch create mode 100644 staging/php/php-fpm.conf.in.patch create mode 100644 staging/php/php.ini.patch create mode 100644 staging/php/rc.d.php-fpm create mode 100644 testing/anjuta-extras/PKGBUILD create mode 100644 testing/anjuta-extras/anjuta-extras.install create mode 100644 testing/anjuta/PKGBUILD create mode 100644 testing/anjuta/anjuta.install create mode 100644 testing/at-spi2-atk/PKGBUILD create mode 100644 testing/at-spi2-atk/at-spi2-atk.install create mode 100644 testing/at-spi2-core/PKGBUILD create mode 100644 testing/atk/PKGBUILD create mode 100644 testing/baobab/PKGBUILD create mode 100644 testing/baobab/baobab.install create mode 100644 testing/brasero/PKGBUILD create mode 100644 testing/brasero/brasero.install create mode 100644 testing/caribou/PKGBUILD create mode 100644 testing/caribou/caribou.install create mode 100644 testing/cheese/PKGBUILD create mode 100644 testing/cheese/cheese.install create mode 100644 testing/clutter-gst/PKGBUILD create mode 100644 testing/clutter-gtk/PKGBUILD create mode 100644 testing/clutter/PKGBUILD create mode 100644 testing/cogl/PKGBUILD create mode 100644 testing/colord/PKGBUILD create mode 100644 testing/dconf/PKGBUILD create mode 100644 testing/dconf/dconf.install create mode 100644 testing/devhelp/PKGBUILD create mode 100644 testing/devhelp/devhelp.install create mode 100644 testing/empathy/PKGBUILD create mode 100644 testing/empathy/empathy.install create mode 100644 testing/eog-plugins/PKGBUILD create mode 100644 testing/eog-plugins/eog-plugins.install create mode 100644 testing/eog/PKGBUILD create mode 100644 testing/eog/eog.install create mode 100644 testing/epiphany-extensions/PKGBUILD create mode 100644 testing/epiphany-extensions/epiphany-extensions.install create mode 100644 testing/epiphany/PKGBUILD create mode 100644 testing/epiphany/epiphany.install create mode 100644 testing/evince/PKGBUILD create mode 100644 testing/evince/evince.install create mode 100644 testing/evolution-data-server/PKGBUILD create mode 100644 testing/evolution-data-server/evolution-data-server.install create mode 100644 testing/evolution-ews/PKGBUILD create mode 100644 testing/evolution-exchange/PKGBUILD create mode 100644 testing/evolution-exchange/evolution-exchange.install create mode 100644 testing/evolution-groupwise/PKGBUILD create mode 100644 testing/evolution/PKGBUILD create mode 100644 testing/evolution/evolution.install create mode 100644 testing/farstream/PKGBUILD create mode 100644 testing/farstream/vp8.patch create mode 100644 testing/folks/PKGBUILD create mode 100644 testing/gcalctool/PKGBUILD create mode 100644 testing/gcalctool/gcalctool.install create mode 100644 testing/gconf/01_xml-gettext-domain.patch create mode 100644 testing/gconf/PKGBUILD create mode 100755 testing/gconf/gconf-merge-schema create mode 100644 testing/gconf/gconf-reload.patch create mode 100644 testing/gconf/gconf.install create mode 100755 testing/gconf/gconfpkg create mode 100644 testing/gcr/PKGBUILD create mode 100644 testing/gcr/gcr.install create mode 100644 testing/gdk-pixbuf2/PKGBUILD create mode 100644 testing/gdk-pixbuf2/gdk-pixbuf2.install create mode 100644 testing/gdl/PKGBUILD create mode 100644 testing/gdm/PKGBUILD create mode 100644 testing/gdm/fix_external_program_directories.patch create mode 100755 testing/gdm/gdm create mode 100644 testing/gdm/gdm-autologin.pam create mode 100644 testing/gdm/gdm-fingerprint.pam create mode 100644 testing/gdm/gdm-password.pam create mode 100644 testing/gdm/gdm-smartcard.pam create mode 100644 testing/gdm/gdm-vt-allocation-hack.patch create mode 100644 testing/gdm/gdm-welcome.pam create mode 100644 testing/gdm/gdm.install create mode 100644 testing/gdm/gdm.pam create mode 100644 testing/gedit/PKGBUILD create mode 100644 testing/gedit/gedit.install create mode 100644 testing/geoclue/PKGBUILD create mode 100644 testing/geoclue/geoclue-gcc46.patch create mode 100644 testing/ghex/PKGBUILD create mode 100644 testing/ghex/ghex.install create mode 100644 testing/gjs/PKGBUILD create mode 100644 testing/glade/PKGBUILD create mode 100644 testing/glade/glade.install create mode 100644 testing/glib-networking/PKGBUILD create mode 100644 testing/glib-networking/glib-networking.install create mode 100644 testing/glib2/PKGBUILD create mode 100644 testing/glib2/glib2.csh create mode 100644 testing/glib2/glib2.sh create mode 100644 testing/glibmm/PKGBUILD create mode 100644 testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules create mode 100644 testing/gnome-bluetooth/PKGBUILD create mode 100644 testing/gnome-bluetooth/gnome-bluetooth.install create mode 100644 testing/gnome-color-manager/PKGBUILD create mode 100644 testing/gnome-color-manager/gnome-color-manager.install create mode 100644 testing/gnome-contacts/PKGBUILD create mode 100644 testing/gnome-contacts/gnome-contacts.install create mode 100644 testing/gnome-control-center/PKGBUILD create mode 100644 testing/gnome-control-center/gnome-control-center.install create mode 100644 testing/gnome-control-center/systemd-fallback.patch create mode 100644 testing/gnome-desktop/PKGBUILD create mode 100644 testing/gnome-dictionary/PKGBUILD create mode 100644 testing/gnome-dictionary/gnome-dictionary.install create mode 100644 testing/gnome-disk-utility/PKGBUILD create mode 100644 testing/gnome-disk-utility/gnome-disk-utility.install create mode 100644 testing/gnome-documents/PKGBUILD create mode 100644 testing/gnome-documents/gnome-documents.install create mode 100644 testing/gnome-font-viewer/PKGBUILD create mode 100644 testing/gnome-font-viewer/gnome-font-viewer.install create mode 100644 testing/gnome-games/PKGBUILD create mode 100644 testing/gnome-games/gnome-games.install create mode 100644 testing/gnome-keyring/PKGBUILD create mode 100644 testing/gnome-keyring/gnome-keyring.install create mode 100644 testing/gnome-media/PKGBUILD create mode 100644 testing/gnome-media/gnome-media.install create mode 100644 testing/gnome-menus/PKGBUILD create mode 100644 testing/gnome-menus/menus.patch create mode 100644 testing/gnome-nettool/PKGBUILD create mode 100644 testing/gnome-nettool/gnome-nettool.install create mode 100644 testing/gnome-online-accounts/PKGBUILD create mode 100644 testing/gnome-online-accounts/gnome-online-accounts.install create mode 100644 testing/gnome-panel/PKGBUILD create mode 100644 testing/gnome-panel/gnome-panel.install create mode 100644 testing/gnome-power-manager/PKGBUILD create mode 100644 testing/gnome-power-manager/gnome-power-manager.install create mode 100644 testing/gnome-screensaver/PKGBUILD create mode 100644 testing/gnome-screensaver/gnome-screensaver.install create mode 100644 testing/gnome-screensaver/gnome-screensaver.pam create mode 100644 testing/gnome-screenshot/PKGBUILD create mode 100644 testing/gnome-screenshot/gnome-screenshot.install create mode 100644 testing/gnome-search-tool/PKGBUILD create mode 100644 testing/gnome-search-tool/gnome-search-tool.install create mode 100644 testing/gnome-session/PKGBUILD create mode 100644 testing/gnome-session/gnome-session.install create mode 100644 testing/gnome-settings-daemon/PKGBUILD create mode 100644 testing/gnome-settings-daemon/gnome-settings-daemon.install create mode 100644 testing/gnome-settings-daemon/systemd-fallback.patch create mode 100644 testing/gnome-shell/PKGBUILD create mode 100644 testing/gnome-shell/gnome-shell.install create mode 100644 testing/gnome-system-log/PKGBUILD create mode 100644 testing/gnome-system-log/gnome-system-log.install create mode 100644 testing/gnome-system-monitor/PKGBUILD create mode 100644 testing/gnome-system-monitor/gnome-system-monitor.install create mode 100644 testing/gnome-terminal/PKGBUILD create mode 100644 testing/gnome-terminal/gnome-terminal.install create mode 100644 testing/gnome-themes-standard/PKGBUILD create mode 100644 testing/gnome-user-share/PKGBUILD create mode 100644 testing/gnome-user-share/gnome-user-share.install create mode 100644 testing/gobject-introspection/PKGBUILD create mode 100644 testing/gpsd/PKGBUILD create mode 100755 testing/gpsd/gpsd create mode 100644 testing/gpsd/gpsd.conf.d create mode 100644 testing/gpsd/gpsd.install create mode 100644 testing/grilo-plugins/PKGBUILD create mode 100644 testing/grilo-plugins/tracker-0.14.patch create mode 100644 testing/gthumb/PKGBUILD create mode 100644 testing/gthumb/gthumb.install create mode 100644 testing/gtk-vnc/PKGBUILD create mode 100644 testing/gtk3/PKGBUILD create mode 100644 testing/gtk3/gtk3.install create mode 100644 testing/gtk3/settings.ini create mode 100644 testing/gtkhtml4/PKGBUILD create mode 100644 testing/gtkmm3/PKGBUILD create mode 100644 testing/gtksourceview3/PKGBUILD create mode 100644 testing/gucharmap/PKGBUILD create mode 100644 testing/gucharmap/gucharmap.install create mode 100644 testing/gvfs/PKGBUILD create mode 100644 testing/gvfs/gvfs-module.install create mode 100644 testing/gvfs/gvfs-smb.install create mode 100644 testing/gvfs/gvfs.install create mode 100644 testing/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch create mode 100644 testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch create mode 100644 testing/libchamplain/PKGBUILD create mode 100644 testing/libcroco/PKGBUILD create mode 100644 testing/libgda/PKGBUILD create mode 100644 testing/libgda/libgda.install create mode 100644 testing/libgdata/PKGBUILD create mode 100644 testing/libgnome-keyring/PKGBUILD create mode 100644 testing/libgnomekbd/PKGBUILD create mode 100644 testing/libgnomekbd/libgnomekbd.install create mode 100644 testing/libgpod/PKGBUILD create mode 100644 testing/libgweather/PKGBUILD create mode 100644 testing/libgweather/gettext-not-xml.patch create mode 100644 testing/libgweather/libgweather.install create mode 100644 testing/libgxps/PKGBUILD create mode 100644 testing/libimobiledevice/PKGBUILD create mode 100644 testing/libimobiledevice/swig-version-check.patch create mode 100644 testing/libmtp/PKGBUILD create mode 100644 testing/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch create mode 100644 testing/libmusicbrainz4/PKGBUILD create mode 100644 testing/libpeas/PKGBUILD create mode 100644 testing/libpeas/libpeas.install create mode 100644 testing/libplist/PKGBUILD create mode 100644 testing/librsvg/PKGBUILD create mode 100644 testing/librsvg/librsvg.install create mode 100644 testing/libsocialweb/PKGBUILD create mode 100644 testing/libsoup/PKGBUILD create mode 100644 testing/libwacom/PKGBUILD create mode 100644 testing/libwebkit/PKGBUILD create mode 100644 testing/libwnck3/PKGBUILD create mode 100644 testing/libxklavier/PKGBUILD create mode 100644 testing/mash/PKGBUILD create mode 100644 testing/metacity/PKGBUILD create mode 100644 testing/metacity/metacity.install create mode 100644 testing/mousetweaks/PKGBUILD create mode 100644 testing/mousetweaks/mousetweaks.install create mode 100644 testing/mutter/PKGBUILD create mode 100644 testing/mutter/mutter.install create mode 100644 testing/mx/PKGBUILD create mode 100644 testing/nautilus-sendto/PKGBUILD create mode 100644 testing/nautilus-sendto/nautilus-sendto.install create mode 100644 testing/nautilus/PKGBUILD create mode 100644 testing/nautilus/nautilus.install create mode 100644 testing/network-manager-applet/PKGBUILD create mode 100644 testing/network-manager-applet/network-manager-applet.install create mode 100644 testing/networkmanager-openconnect/PKGBUILD create mode 100644 testing/networkmanager-openconnect/networkmanager-openconnect.install create mode 100644 testing/networkmanager-openvpn/PKGBUILD create mode 100644 testing/networkmanager-openvpn/networkmanager-openvpn.install create mode 100644 testing/networkmanager-pptp/PKGBUILD create mode 100644 testing/networkmanager-pptp/networkmanager-pptp.install create mode 100644 testing/networkmanager-vpnc/PKGBUILD create mode 100644 testing/networkmanager-vpnc/networkmanager-vpnc.install create mode 100644 testing/networkmanager/dnsmasq-path.patch create mode 100644 testing/networkmanager/systemd-fallback.patch create mode 100644 testing/pango/PKGBUILD create mode 100644 testing/pango/pango.install create mode 100644 testing/pidgin/PKGBUILD create mode 100644 testing/pidgin/pidgin.install create mode 100644 testing/pidgin/port-to-farstream-v3.patch create mode 100644 testing/pygobject/PKGBUILD create mode 100644 testing/rhythmbox/PKGBUILD create mode 100644 testing/rhythmbox/rhythmbox.install create mode 100644 testing/seahorse/PKGBUILD create mode 100644 testing/seahorse/seahorse-ssh-askpass.sh create mode 100644 testing/seahorse/seahorse.install create mode 100644 testing/sound-juicer/PKGBUILD create mode 100644 testing/sound-juicer/sound-juicer.install create mode 100644 testing/sushi/PKGBUILD create mode 100644 testing/system-config-printer/PKGBUILD create mode 100644 testing/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch create mode 100644 testing/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch create mode 100644 testing/systemd/PKGBUILD create mode 100644 testing/systemd/cpp-compat.patch create mode 100644 testing/systemd/os-release create mode 100644 testing/systemd/systemd.install create mode 100644 testing/telepathy-farstream/PKGBUILD create mode 100644 testing/telepathy-gabble/PKGBUILD create mode 100644 testing/telepathy-gabble/telepathy-gabble.install create mode 100644 testing/telepathy-glib/PKGBUILD create mode 100644 testing/telepathy-haze/PKGBUILD create mode 100644 testing/telepathy-haze/telepathy-haze.install create mode 100644 testing/telepathy-mission-control/PKGBUILD create mode 100644 testing/telepathy-mission-control/telepathy-mission-control.install create mode 100644 testing/telepathy-qt4/PKGBUILD create mode 100644 testing/telepathy-qt4/gcc47.patch create mode 100644 testing/tomboy/PKGBUILD create mode 100644 testing/tomboy/tomboy.install create mode 100644 testing/totem-plparser/PKGBUILD create mode 100644 testing/totem/PKGBUILD create mode 100644 testing/totem/browser-plugins.ini create mode 100644 testing/totem/totem.install create mode 100644 testing/tracker/PKGBUILD create mode 100644 testing/tracker/tracker.install create mode 100644 testing/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch create mode 100644 testing/udev/0002-reinstate-TIMEOUT-handling.patch create mode 100644 testing/udisks/PKGBUILD create mode 100644 testing/udisks2/PKGBUILD create mode 100644 testing/vala/PKGBUILD create mode 100644 testing/vinagre/PKGBUILD create mode 100644 testing/vinagre/vinagre.install create mode 100644 testing/vino/PKGBUILD create mode 100644 testing/vino/vino.install create mode 100644 testing/vte3/PKGBUILD create mode 100644 testing/xdg-user-dirs-gtk/PKGBUILD create mode 100644 testing/xdg-user-dirs-gtk/lxde.patch create mode 100644 testing/yelp/PKGBUILD create mode 100644 testing/yelp/yelp.install create mode 100644 testing/zenity/PKGBUILD diff --git a/community-staging/fatrat/PKGBUILD b/community-staging/fatrat/PKGBUILD index 496c06e7b..003861271 100644 --- a/community-staging/fatrat/PKGBUILD +++ b/community-staging/fatrat/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66844 2012-02-29 11:27:59Z stativ $ +# $Id: PKGBUILD 68763 2012-04-01 19:36:54Z stativ $ # Maintainer: Lukas Jirkovsky pkgname=fatrat pkgver=1.2.0_beta1 -pkgrel=4 +pkgrel=5 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64') url="http://fatrat.dolezel.info/" diff --git a/community-staging/libfbclient/ChangeLog b/community-staging/libfbclient/ChangeLog new file mode 100644 index 000000000..f02bd5ff5 --- /dev/null +++ b/community-staging/libfbclient/ChangeLog @@ -0,0 +1,26 @@ + +2009-06-08 Douglas Soares de Andrade + + * Rebuilt for the new icu + +2009-04-09 Douglas Soares de Andrade + + * Updated for i686: 2.1.2 + +2008-08-10 Douglas Soares de Andrade + + * Updated for i686: 2.1.1 + +2008-05-10 Mateusz Herych + + * Updated for x86_64 - 2.1.0 + +2008-04-28 Douglas Soares de Andrade + + * Updated for i686 - 2.1.0 + * Sure, firebird is the hell to build. Waiting contributions ;-) + +2007-07-06 tardo + + * Built for x86_64 + * This is the most fucked up pkg evar. diff --git a/community-staging/libfbclient/LICENSE b/community-staging/libfbclient/LICENSE new file mode 100644 index 000000000..e735b0cc1 --- /dev/null +++ b/community-staging/libfbclient/LICENSE @@ -0,0 +1,44 @@ + +LICENSES +-------- + +The applicable and approved licenses for the source files +of the Firebird RDBMS project are: + + 1) InterBase Public License (IPL), version 1.0 + http://bdn.borland.com/article/0,1410,30198,00.html + + 2) Initial Developer's Public License (IDPL), version 1.0 + http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl + +The IPL is copyright of Borland Corp., the other licenses are copyright +by the source code authors and contributors. + + +USAGE RULES +----------- + +1) The source code which was released under the IPL must keep this license. + All modifications / adaptations of this code are still subjects of the IPL. + +2) The files that are derived from the IPL covered code, must also keep + this license. It means that if any new file contains some code covered by + the IPL, then this file should be released under the IPL too. + +3) The new files developed by the members of the Firebird project should + be released under the IDPL. + +4) The new files contributed by people who are not members of the Firebird + project should follow the rule #3. If an author (initial developer) doesn't + specify the license to be used, the person who applies the contributed code + to the CVS tree (a committer) becomes responsible for the license assigned + to the contributed code. + +5) Every non-binary file that exists in the CVS tree, should have a header + section which describes the license this code is released under. If a file + contains no header, it means that this code is freeware and nobody owns the + appropriate copyrights. + + +You may find the exhibits for the approved licenses in /doc/license directory +of the CVS tree. diff --git a/community-staging/libfbclient/PKGBUILD b/community-staging/libfbclient/PKGBUILD new file mode 100644 index 000000000..2a4fabae9 --- /dev/null +++ b/community-staging/libfbclient/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 68790 2012-04-01 22:23:35Z lcarlier $ +# Maintainer: Carlier Laurent +# Contributor: Douglas Soares de Andrade + +pkgname=libfbclient +pkgver=2.5.1.26351 +pkgrel=2 +pkgdesc="Client library for Firebird." +arch=('i686' 'x86_64') +url="http://www.firebirdsql.org/" +license=('custom') +depends=('gcc-libs' 'icu') +options=('!makeflags') +source=(http://downloads.sourceforge.net/firebird/Firebird-$pkgver-0.tar.bz2 + LICENSE) +md5sums=('1772fba4f09c8fc84d989282405f90fd' + '0d61798861e159c85dbdf0f30fe2f2ce') + +build() { + cd $srcdir/Firebird-$pkgver-0 + + ./configure --prefix=/usr --with-system-icu --without-fbudf \ + --without-fbsbin --without-fbconf --without-fbdoc --without-fbsample \ + --without-fbsample-db --without-fbintl --without-fbmisc --without-fbhelp \ + --without-fbsecure-db --with-fbmsg=/usr/share/firebird --without-fblog \ + --without-fbglock --without-fbplugins + + make +} + +package() { + cd $srcdir/Firebird-$pkgver-0 + + mkdir -p $pkgdir/usr/{bin,share/firebird} + cp -R gen/firebird/{lib,include} $pkgdir/usr + rm -f $pkgdir/usr/lib/libedit.a + install -m644 gen/firebird/*.msg $pkgdir/usr/share/firebird + install -m755 gen/firebird/bin/fb_config $pkgdir/usr/bin + mkdir -p $srcdir/usr/share/licenses/$pkgname/ + install -D -m644 ${srcdir}/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/community-staging/openttd/PKGBUILD b/community-staging/openttd/PKGBUILD new file mode 100644 index 000000000..2e3f137a5 --- /dev/null +++ b/community-staging/openttd/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 68788 2012-04-01 22:22:11Z lcarlier $ +# Maintainer: Vesa Kaihlavirta + +pkgname=openttd +pkgver=1.2.0rc4 +_realpkgver=1.2.0-RC4 +pkgrel=1 +pkgdesc='An engine for running Transport Tycoon Deluxe.' +arch=('i686' 'x86_64') +url='http://www.openttd.org' +license=('GPL') +depends=('libpng' 'sdl' 'icu' 'fontconfig' 'lzo2' 'hicolor-icon-theme' 'desktop-file-utils' 'xz') +install=openttd.install +optdepends=('openttd-opengfx: free graphics' + 'openttd-opensfx: free soundset') +source=("http://binaries.openttd.org/releases/${_realpkgver}/${pkgname}-${_realpkgver}-source.tar.xz") +md5sums=('b8692deb951dc3a88c321a9e4b254dd2') + +build() { + cd ${pkgname}-${_realpkgver} + + ./configure \ + --prefix-dir=/usr \ + --binary-name=${pkgname} \ + --binary-dir=bin \ + --data-dir=share/${pkgname} \ + --install-dir=${pkgdir} \ + --doc-dir=share/doc/${pkgname} \ + --menu-name="OpenTTD" \ + --personal-dir=.${pkgname} + + make +} + +package() { + cd ${pkgname}-${_realpkgver} + + make install +} diff --git a/community-staging/openttd/openttd.install b/community-staging/openttd/openttd.install new file mode 100644 index 000000000..85b22a1c5 --- /dev/null +++ b/community-staging/openttd/openttd.install @@ -0,0 +1,17 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1 + update-desktop-database > /dev/null 2>&1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + update-desktop-database > /dev/null 2>&1 +} + +post_remove() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor > /dev/null 2>&1 + update-desktop-database > /dev/null 2>&1 +} diff --git a/community-staging/pion-net/PKGBUILD b/community-staging/pion-net/PKGBUILD index 5a8c5e611..15a4475ac 100644 --- a/community-staging/pion-net/PKGBUILD +++ b/community-staging/pion-net/PKGBUILD @@ -1,33 +1,26 @@ -# $Id: PKGBUILD 66798 2012-02-28 18:49:15Z stativ $ +# $Id: PKGBUILD 68756 2012-04-01 13:33:35Z stativ $ # Maintainer: Lukas Jirkovsky # Contributor: David Watzke pkgname=pion-net -pkgver=4.0.7 -pkgrel=3 +pkgver=4.0.11 +pkgrel=1 pkgdesc="A C++ development library for implementing lightweight HTTP interfaces" url="http://www.pion.org/projects/pion-network-library" arch=('i686' 'x86_64') license=('custom:Boost') depends=('boost-libs' 'openssl' 'log4cpp') makedepends=('boost') -source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2" - "$pkgname-4.0.5-build.patch") -md5sums=('761c8af8dc54102b637f8d91d162f987' - 'd75ea2af90163a81d2bc71fda00f0c00') +source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2") +md5sums=('e5cf42a02681c5d73e7be6784d99fece') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir/$pkgname-4.0.5-build.patch" - # override configure bug (forces debug even when nobody asked for it) - sed -i "s/ -ggdb//g;s/ -DNDEBUG//g" configure - - ./configure --prefix=/usr --disable-doxygen-doc --with-log4cpp + sed -i "s/ -ggdb//g" configure - find -name Makefile -print0 | xargs -0 \ - sed -i -r '/^C(XX)?FLAGS/ s/$/ -DBOOST_FILESYSTEM_VERSION=2/' Makefile + ./configure --prefix=/usr --disable-doxygen-doc # override Makefile bug sed -i "/docs:/ s/doxygen-doc//" Makefile diff --git a/community-testing/contacts/0001-Fix-Makefile-whitespace.patch b/community-testing/contacts/0001-Fix-Makefile-whitespace.patch new file mode 100644 index 000000000..3c6e3b5f9 --- /dev/null +++ b/community-testing/contacts/0001-Fix-Makefile-whitespace.patch @@ -0,0 +1,19 @@ +From d69e65a87e58059fb7876987b4369d932ac35e17 Mon Sep 17 00:00:00 2001 +From: Joshua Lock +Date: Wed, 15 Dec 2010 14:06:44 +0000 +Subject: Fix Makefile whitespace for the new improved strict make 3.82 + +Signed-off-by: Joshua Lock +--- +diff --git a/Makefile.am b/Makefile.am +index 7c36d37..0a24f3d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -11,4 +11,4 @@ DISTCLEANFILES = $(INTLTOOL_BUILT) + MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp $(INTLTOOL_BUILT:=.in) install-sh ltmain.sh mkinstalldirs Makefile.in missing + + snapshot: +- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` ++ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` +-- +cgit v0.9.0.2 diff --git a/community-testing/contacts/PKGBUILD b/community-testing/contacts/PKGBUILD new file mode 100644 index 000000000..a2fb71ad6 --- /dev/null +++ b/community-testing/contacts/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 68782 2012-04-01 22:05:25Z bgyorgy $ +# Maintainer: Balló György + +pkgname=contacts +pkgver=0.12 +pkgrel=6 +pkgdesc="Small, lightweight GTK+ address book app" +arch=('i686' 'x86_64') +url="http://pimlico-project.org/contacts.html" +license=('GPL') +depends=('gtk2' 'evolution-data-server' 'desktop-file-utils' 'xdg-utils') +makedepends=('intltool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2 + 0001-Fix-Makefile-whitespace.patch) +sha256sums=('0993f34819b92e09ab64e8a90231afc3178a19a4a99cf02c3050f51a44850782' + 'f6e3879c1aacbb62e481d9c1c33679ae12f986a26a96b112ec4d7f5f3358efbf') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/0001-Fix-Makefile-whitespace.patch" + + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-schemas-install --disable-gnome-vfs \ + --with-gconf-schema-file-dir=/usr/share/gconf/schemas + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community-testing/contacts/contacts.install b/community-testing/contacts/contacts.install new file mode 100644 index 000000000..f52f6a097 --- /dev/null +++ b/community-testing/contacts/contacts.install @@ -0,0 +1,24 @@ +pkgname=contacts + +post_install() { + gconfpkg --install $pkgname + update-desktop-database -q + xdg-icon-resource forceupdate +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + gconfpkg --uninstall $pkgname +} + +post_remove() { + update-desktop-database -q + xdg-icon-resource forceupdate +} diff --git a/community-testing/dates/0001-Fix-FTBFS-with-newer-GCC.patch b/community-testing/dates/0001-Fix-FTBFS-with-newer-GCC.patch new file mode 100644 index 000000000..674ec2395 --- /dev/null +++ b/community-testing/dates/0001-Fix-FTBFS-with-newer-GCC.patch @@ -0,0 +1,39 @@ +From f3e8719489fc5db5ae87dd03d39aad176d65762f Mon Sep 17 00:00:00 2001 +From: Paul Wise +Date: Fri, 29 Apr 2011 13:10:15 +0800 +Subject: [PATCH] Fix FTBFS with newer GCC + +--- + configure.ac | 2 +- + src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7f009d9..0181292 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,7 +17,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) + AC_SUBST(GETTEXT_PACKAGE) + AM_GLIB_GNU_GETTEXT + +-PKG_CHECK_MODULES(DATES, glib-2.0 gtk+-2.0 libecal-1.2 gconf-2.0) ++PKG_CHECK_MODULES(DATES, glib-2.0 gtk+-2.0 libecal-1.2 gconf-2.0 pango) + + PKG_CHECK_MODULES(GTK, gtk+-2.0) + AC_SUBST(GTK_CFLAGS) +diff --git a/src/Makefile.am b/src/Makefile.am +index 90c7049..3bb4f32 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -35,7 +35,7 @@ dates_SOURCES = $(platform) \ + gconf-bridge.h \ + gconf-bridge.c + +-dates_LDADD = $(DATES_LIBS) libgtkdatesview.la ++dates_LDADD = libgtkdatesview.la -lm $(DATES_LIBS) + + if USE_OWL + dates_LDADD += $(top_builddir)/libowl/libowl.la +-- +1.7.4.4 + diff --git a/community-testing/dates/0001-Fix-Makefile-whitespace.patch b/community-testing/dates/0001-Fix-Makefile-whitespace.patch new file mode 100644 index 000000000..9feda3915 --- /dev/null +++ b/community-testing/dates/0001-Fix-Makefile-whitespace.patch @@ -0,0 +1,20 @@ +From bc98e2896682ac831cd27142c7e76fe0f8280bee Mon Sep 17 00:00:00 2001 +From: Joshua Lock +Date: Wed, 15 Dec 2010 14:07:50 +0000 +Subject: Fix Makefile whitespace for the new improved strict make 3.82 + +Signed-off-by: Joshua Lock +--- +diff --git a/Makefile.am b/Makefile.am +index e8a3c7f..51b4f1d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -7,5 +7,5 @@ DISTCLEANFILES = intltool-extract intltool-merge intltool-update + MAINTAINERCLEANFILES = $(DISTCLEANFILES) aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing + + snapshot: +- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` ++ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` + +-- +cgit v0.9.0.2 diff --git a/community-testing/dates/0001-Replaced-the-calls-to-the-deprecated-functions-e_sou.patch b/community-testing/dates/0001-Replaced-the-calls-to-the-deprecated-functions-e_sou.patch new file mode 100644 index 000000000..e7fce46f3 --- /dev/null +++ b/community-testing/dates/0001-Replaced-the-calls-to-the-deprecated-functions-e_sou.patch @@ -0,0 +1,155 @@ +From 7771e0b3d75b4ba04756d6c6ffc03d644df2db5f Mon Sep 17 00:00:00 2001 +From: Lucas Hermann Negri +Date: Wed, 13 Oct 2010 18:49:20 -0300 +Subject: [PATCH] Replaced the calls to the deprecated functions e_source_{set,get}_color + with the new API (e_source_{set,peek}_color_spec). + +--- + src/dates_gtk.c | 40 ++++++++++++---------------------------- + src/dates_main.c | 2 +- + src/dates_view.c | 10 ++++------ + 3 files changed, 17 insertions(+), 35 deletions(-) + +diff --git a/src/dates_gtk.c b/src/dates_gtk.c +index 78e71bb..403bc25 100644 +--- a/src/dates_gtk.c ++++ b/src/dates_gtk.c +@@ -1016,7 +1016,6 @@ calendar_do_new_dialog (GtkWindow *parent, DatesData *d) + GtkTreeIter iter; + GError *error = NULL; + const gchar *relative_uri; +- guint32 new_colour; + + #ifdef WITH_HILDON + GdkColor *hildon_color; +@@ -1055,7 +1054,8 @@ calendar_do_new_dialog (GtkWindow *parent, DatesData *d) + source = e_source_new (name, relative_uri); + + #ifdef USE_OWL +- new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); ++ guint32 new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); ++ e_source_set_color (source, new_colour); + #else + + #ifdef WITH_HILDON +@@ -1063,17 +1063,11 @@ calendar_do_new_dialog (GtkWindow *parent, DatesData *d) + #else + gtk_color_button_get_color (GTK_COLOR_BUTTON(color_button), &colour); + #endif +- new_colour = (guint8)(colour.red >> 8); +- new_colour <<= 8; +- new_colour |= (guint8)(colour.green >> 8); +- new_colour <<= 8; +- new_colour |= (guint8)(colour.blue >> 8); +- new_colour <<= 8; ++ gchar *n_color = gdk_color_to_string (&colour); ++ e_source_set_color_spec (source, n_color); ++ g_free(n_color); + #endif + +- /* Set the colour */ +- e_source_set_color (source, new_colour); +- + /* Set the group for the source */ + e_source_set_group (source, group); + e_source_group_add_source (group, source, 0); +@@ -1169,7 +1163,6 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d) + ESourceGroup *group; + + GdkColor colour; +- guint32 raw_colour; + + const gchar *name = NULL; + const gchar *uri = NULL; +@@ -1335,12 +1328,8 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d) + gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + + /* Get the colour from the the source */ +- e_source_get_color (source, &raw_colour); +- +- /* Munge this into something usable */ +- colour.red = (guint16)(((raw_colour & 0xff0000) >> 16) << 8); +- colour.green = (guint16)(((raw_colour & 0xff00) >> 8) << 8); +- colour.blue = (guint16)(((raw_colour & 0xff) << 8)); ++ const gchar* spec = e_source_peek_color_spec(source); ++ gdk_color_parse(spec, &colour); + + /* Now we need to allocate the colour */ + gdk_colormap_alloc_color (gdk_colormap_get_system (), &colour, TRUE, TRUE); +@@ -1440,26 +1429,21 @@ calendar_do_edit_dialog (GtkWindow *parent, ESource *source, DatesData *d) + * Next we need to pack the GDK colour into guint32 + * for eds + */ +- guint32 new_colour = 0; + + GError *error = NULL; + #ifdef USE_OWL +- new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); ++ guint32 new_colour = owl_colour_button_get_colour (OWL_COLOUR_BUTTON (color_button)); ++ e_source_set_color (source, new_colour); + #else + #ifdef WITH_HILDON + hildon_color_button_get_color (HILDON_COLOR_BUTTON(color_button), &colour); + #else + gtk_color_button_get_color (GTK_COLOR_BUTTON(color_button), &colour); + #endif +- new_colour = (guint8)(colour.red >> 8); +- new_colour <<= 8; +- new_colour |= (guint8)(colour.green >> 8); +- new_colour <<= 8; +- new_colour |= (guint8)(colour.blue >> 8); +- new_colour <<= 8; ++ gchar *n_color = gdk_color_to_string (&colour); ++ e_source_set_color_spec (source, n_color); ++ g_free(n_color); + #endif +- /* Update the colour */ +- e_source_set_color (source, new_colour); + + /* And the name */ + e_source_set_name (source, (gtk_entry_get_text (GTK_ENTRY (name_entry)))); +diff --git a/src/dates_main.c b/src/dates_main.c +index ce05fe8..1f7770d 100644 +--- a/src/dates_main.c ++++ b/src/dates_main.c +@@ -112,7 +112,7 @@ dates_load_calendars (DatesData *d) + system_source = e_source_new (_("Personal"), "system"); + + /* Default Evolution colour */ +- e_source_set_color (system_source, 0xBECEDD); ++ e_source_set_color_spec (system_source, "#BECEDD"); + + /* Set the group for the source and put it in the group */ + e_source_set_group (system_source, local_group); +diff --git a/src/dates_view.c b/src/dates_view.c +index d65db2f..9d28a15 100644 +--- a/src/dates_view.c ++++ b/src/dates_view.c +@@ -4846,7 +4846,6 @@ dates_view_add_calendar (DatesView *view, ECal *ecal) + DatesViewPrivate *priv = DATES_VIEW_GET_PRIVATE (view); + DatesViewCalendar *cal; + ESource *source; +- guint32 colour; + /* GError *error = NULL;*/ + + g_return_if_fail (E_IS_CAL (ecal)); +@@ -4876,12 +4875,11 @@ dates_view_add_calendar (DatesView *view, ECal *ecal) + cal->text_gc = gdk_gc_new ( + GDK_DRAWABLE (priv->main->window)); + +- if (e_source_get_color (source, &colour)) { ++ const gchar* spec = e_source_peek_color_spec (source); ++ if (spec) { + GdkColor gcolour, dgcolour, tgcolour; +- gcolour.red = ((colour & 0xFF0000) >> 16) * 0x101; +- gcolour.green = ((colour & 0xFF00) >> 8) * 0x101; +- gcolour.blue = (colour & 0xFF) * 0x101; +- ++ gdk_color_parse(spec, &gcolour); ++ + /* This is simplified sRGB -> LAB conversion; we do not need it + * entirely precise, as we are only going to chose between + * black or white text based on the L value. +-- +1.7.3.1 + diff --git a/community-testing/dates/PKGBUILD b/community-testing/dates/PKGBUILD new file mode 100644 index 000000000..0c6dcf2d1 --- /dev/null +++ b/community-testing/dates/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 68786 2012-04-01 22:13:21Z bgyorgy $ +# Maintainer: Balló György + +pkgname=dates +pkgver=0.4.11 +pkgrel=5 +pkgdesc="Small, lightweight GTK+ calendar app" +arch=('i686' 'x86_64') +url="http://pimlico-project.org/dates.html" +license=('GPL') +depends=('gtk2' 'evolution-data-server' 'xdg-utils') +makedepends=('intltool') +options=('!emptydirs') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 + 0001-Replaced-the-calls-to-the-deprecated-functions-e_sou.patch + 0001-Fix-Makefile-whitespace.patch + 0001-Fix-FTBFS-with-newer-GCC.patch) +sha256sums=('60b0cfe1fa6dee684e255c2a0cd02febafb9d16607ba4b05196e983cd8012c03' + '88ab8de4861253be1a8db1be4432f71307fcffa376be95e9495cff021b7ead62' + 'fc20f51200a78c74881b98f2b2ea9c3ba01f09393fcc2cf38ecab78ee54f4bb4' + '0e32c4d9ac4c604330bf8672e47e44c710ae56d9f6dc496e736166c536a4787e') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/0001-Replaced-the-calls-to-the-deprecated-functions-e_sou.patch" + patch -Np1 -i "$srcdir/0001-Fix-Makefile-whitespace.patch" + patch -Np1 -i "$srcdir/0001-Fix-FTBFS-with-newer-GCC.patch" + + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-owl + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} diff --git a/community-testing/dates/dates.install b/community-testing/dates/dates.install new file mode 100644 index 000000000..2c455e952 --- /dev/null +++ b/community-testing/dates/dates.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/community-testing/lomoco/PKGBUILD b/community-testing/lomoco/PKGBUILD new file mode 100644 index 000000000..03d680160 --- /dev/null +++ b/community-testing/lomoco/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 68775 2012-04-01 19:51:42Z dreisner $ +# Maintainer: Jeff Mickey +# Contributor: Shadowhand + +pkgname=lomoco +pkgver=1.0 +pkgrel=8 +url="http://www.lomoco.org/" +pkgdesc="Logitech USB mouse configuration program" +license=('GPL') +depends=('libusb-compat') +replaces=('lmctl') +arch=('i686' 'x86_64') +options=(!libtool) +backup=(etc/udev/lomoco_mouse.conf) +source=(http://www.lomoco.org/${pkgname}-${pkgver}.tar.gz + "lomoco_mx518.patch::https://bugs.archlinux.org/task/28180?getfile=8163" + lomoco_mouse.conf + lomoco.sh) +md5sums=('f5197d0a3ee81229c3eecc1e03f7b08d' + '87aeccb99413faf9e49453215c3d0b8a' + '182b10a7e4a1828a93c1d55ef7f81b97' + 'bc92f661641265b33b27895ef24028fd') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -p1 <$srcdir/lomoco_mx518.patch + ./autogen.sh --prefix=/usr --mandir=/usr/share/man + make + make udev-rules + make DESTDIR=${pkgdir} install + + # Fix and install udev rules and helpers + sed -i 's|/etc/sysconfig/logitech_mouse|/etc/udev/lomoco_mouse.conf|g' udev/udev.lomoco + sed -i 's|RUN="lomoco"|RUN+="lomoco.sh"|g' udev/lomoco.rules + sed -i 's|SYSFS|ATTR|' udev/lomoco.rules + install -D -m 644 udev/lomoco.rules ${pkgdir}/usr/lib/udev/rules.d/80-lomoco.rules + install -D -m 755 ../lomoco.sh ${pkgdir}/usr/lib/udev/lomoco.sh + install -D -m 644 ../lomoco_mouse.conf ${pkgdir}/etc/udev/lomoco_mouse.conf +} diff --git a/community-testing/lomoco/lomoco.sh b/community-testing/lomoco/lomoco.sh new file mode 100644 index 000000000..76e2392da --- /dev/null +++ b/community-testing/lomoco/lomoco.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +if [ -n "$BUSNUM" -a -n "$DEVNUM" ]; then + . /etc/udev/lomoco_mouse.conf + + options= + + if [ -n "$LOGITECH_MOUSE_RESOLUTION" ]; then + options="--$LOGITECH_MOUSE_RESOLUTION" + fi + + case "$LOGITECH_MOUSE_SMS" in + yes) options="$options --sms" ;; + no) options="$options --no-sms" ;; + esac + + if [ -n "$options" ]; then + /usr/bin/lomoco -b $BUSNUM -d $DEVNUM $options + fi + +fi 2>&1 | /usr/bin/logger -t lomoco diff --git a/community-testing/lomoco/lomoco_mouse.conf b/community-testing/lomoco/lomoco_mouse.conf new file mode 100644 index 000000000..b8c534ec2 --- /dev/null +++ b/community-testing/lomoco/lomoco_mouse.conf @@ -0,0 +1,5 @@ +# Possible Resolutions Are: 400 800 1200 1600 2000 +#LOGITECH_MOUSE_RESOLUTION="800" + +# SmartScroll/Cruise Control (SMS command set): yes or no +#LOGITECH_MOUSE_SMS="no" diff --git a/community-testing/multipath-tools/PKGBUILD b/community-testing/multipath-tools/PKGBUILD new file mode 100644 index 000000000..267d1c27b --- /dev/null +++ b/community-testing/multipath-tools/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 68770 2012-04-01 19:51:20Z dreisner $ +# Maintainer: +# Contributor: Thomas S Hatch +# Contributor: Michael P +# Contributor: Matt Heagney + +pkgname=multipath-tools +pkgver=0.4.9 +pkgrel=6 +pkgdesc="Multipath Tools For Linux" +arch=('i686' 'x86_64') +url="http://christophe.varoqui.free.fr/" +license=('GPL') +depends=('libaio' 'device-mapper') +backup=('etc/multipath.conf' 'etc/multipath.conf.annotated') +install=multipath-tools.install +options=('!emptydirs') +source=("http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2" + "multipath.conf" "multipath.conf.annotated" "multipathd.rc" 'fix-build.patch') +md5sums=('a6d4b48afc28f1f50f5ee4b1b06d2765' + '9324ff0ba8330dcb21b2fcf64988026f' + 'be11462922eeeb9fcd2ba5f3f137b7d9' + '7c04ef96441363b0d43a2ebb13a87659' + '2576fc535d7fa767837b1c7827013e52') + +build() { + patch -p1 -i fix-build.patch + + sed -i 's|etc/udev|usr/lib/udev|g' multipath/Makefile kpartx/Makefile + sed -i 's|/sbin/|/usr/bin/|g' kpartx/kpartx.rules + + # Needs to be fixed upstream. Refer to + # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814 + export LDFLAGS=${LDFLAGS/-Wl,--as-needed} + + make +} + +package() { + make LIB="usr/lib" DESTDIR="$pkgdir" bindir="/usr/bin" libudevdir="/usr/lib/udev" install + install -D -m 644 multipath.conf "$pkgdir"/etc/multipath.conf + install -D -m 644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated + install -D -m 755 multipathd.rc "$pkgdir"/etc/rc.d/multipathd +} diff --git a/community-testing/multipath-tools/fix-build.patch b/community-testing/multipath-tools/fix-build.patch new file mode 100644 index 000000000..c6196f73b --- /dev/null +++ b/community-testing/multipath-tools/fix-build.patch @@ -0,0 +1,140 @@ +--- multipath-tools-0.4.9.orig/kpartx/Makefile 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/kpartx/Makefile 2010-11-28 12:14:25.763531104 -0800 +@@ -6,7 +6,7 @@ + + CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 + +-LDFLAGS = -ldevmapper ++LIBS = -ldevmapper + OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ + gpt.o mac.o crc32.o lopart.o xstrncpy.o devmapper.o + EXEC = kpartx +@@ -14,8 +14,7 @@ + all: $(EXEC) + + $(EXEC): $(OBJS) +- $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) +- $(GZIP) $(EXEC).8 > $(EXEC).8.gz ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) + + install: $(EXEC) $(EXEC).8 + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) +@@ -23,13 +22,14 @@ + $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir) + $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir) + $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d +- $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/ ++ $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) + + uninstall: + rm -f $(DESTDIR)$(bindir)/$(EXEC) +- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz ++ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 ++ rm -f $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules + + clean: +- rm -f core *.o $(EXEC) *.gz ++ rm -f core *.o $(EXEC) +--- multipath-tools-0.4.9.orig/Makefile.inc 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/Makefile.inc 2010-11-28 12:14:25.763531104 -0800 +@@ -32,11 +32,10 @@ + syslibdir = $(prefix)/$(LIB) + libdir = $(prefix)/$(LIB)/multipath + +-GZIP = /bin/gzip -9 -c + INSTALL_PROGRAM = install + +-OPTFLAGS = -pipe -g -Wall -Wunused -Wstrict-prototypes +-CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" ++OPTFLAGS = -Wall -Wunused -Wstrict-prototypes ++CFLAGS += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" + SHARED_FLAGS = -shared + + %.o: %.c +--- multipath-tools-0.4.9.orig/multipath/Makefile 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/multipath/Makefile 2010-11-28 12:14:46.718697048 -0800 +@@ -7,32 +7,30 @@ + OBJS = main.o + + CFLAGS += -I$(multipathdir) +-LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir) ++LIBS = -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath + + EXEC = multipath + + all: $(EXEC) + + $(EXEC): $(OBJS) +- $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) +- $(GZIP) $(EXEC).8 > $(EXEC).8.gz +- $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) + + install: + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ + $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d +- $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/ ++ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/65-multipath.rules + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir) + + uninstall: +- rm $(DESTDIR)/etc/udev/rules.d/multipath.rules +- rm $(DESTDIR)$(bindir)/$(EXEC) +- rm $(DESTDIR)$(mandir)/$(EXEC).8.gz +- rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz ++ rm -f $(DESTDIR)/etc/udev/rules.d/65-multipath.rules ++ rm -f $(DESTDIR)$(bindir)/$(EXEC) ++ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 ++ rm -f $(DESTDIR)$(man5dir)/$(EXEC).conf.5 + + clean: +- rm -f core *.o $(EXEC) *.gz ++ rm -f core *.o $(EXEC) +--- multipath-tools-0.4.9.orig/multipathd/Makefile 2010-05-22 05:01:58.000000000 -0700 ++++ multipath-tools-0.4.9/multipathd/Makefile 2010-11-28 12:15:46.624171566 -0800 +@@ -6,8 +6,8 @@ + # basic flags setting + # + CFLAGS += -I$(multipathdir) +-LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \ +- -lmultipath -L$(multipathdir) ++LIBS = -lpthread -ldevmapper -lreadline -lncurses -ldl \ ++ -L$(multipathdir) -lmultipath + + # + # debuging stuff +@@ -28,21 +28,20 @@ + all : $(EXEC) + + $(EXEC): $(OBJS) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS) +- $(GZIP) $(EXEC).8 > $(EXEC).8.gz ++ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) + + install: + $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir) + $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) +- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) ++ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) + + uninstall: + rm -f $(DESTDIR)$(bindir)/$(EXEC) + rm -f $(DESTDIR)$(rcdir)/$(EXEC) +- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz ++ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 + + clean: +- rm -f core *.o $(EXEC) *.gz ++ rm -f core *.o $(EXEC) + diff --git a/community-testing/multipath-tools/multipath-tools.install b/community-testing/multipath-tools/multipath-tools.install new file mode 100644 index 000000000..fa58bbc35 --- /dev/null +++ b/community-testing/multipath-tools/multipath-tools.install @@ -0,0 +1,4 @@ +post_install() { + + echo " * For full functonality ensure that the dm_multipath kernel module is loaded" +} diff --git a/community-testing/multipath-tools/multipath.conf b/community-testing/multipath-tools/multipath.conf new file mode 100644 index 000000000..6dacf093d --- /dev/null +++ b/community-testing/multipath-tools/multipath.conf @@ -0,0 +1,8 @@ +# +# Very Basic Multipath Configuration File +# + +defaults { + getuid_callout "/usr/lib/udev/scsi_id -g -u -d /dev/%n" +} + diff --git a/community-testing/multipath-tools/multipath.conf.annotated b/community-testing/multipath-tools/multipath.conf.annotated new file mode 100644 index 000000000..b79488413 --- /dev/null +++ b/community-testing/multipath-tools/multipath.conf.annotated @@ -0,0 +1,362 @@ +## +## This is a template multipath-tools configuration file +## Uncomment the lines relevent to your environment +## +# +## +## name : defaults +## desc : multipath-tools default settings +## +#defaults { +# # +# # name : udev_dir +# # desc : directory where udev creates its device nodes +# # default : /dev +# # +# udev_dir /dev +# +# # +# # name : polling_interval +# # scope : multipathd +# # desc : interval between two path checks in seconds +# # default : 5 +# # +# polling_interval 10 +# +# # +# # name : selector +# # scope : multipath +# # desc : the default path selector algorithm to use +# # these algorithms are offered by the kernel multipath target +# # values : "round-robin 0" +# # default : "round-robin 0" +# # +# selector "round-robin 0" +# +# # +# # name : path_grouping_policy +# # scope : multipath +# # desc : the default path grouping policy to apply to unspecified +# # multipaths +# # default : multibus +# # +# path_grouping_policy multibus +# +# # +# # name : getuid_callout +# # scope : multipath +# # desc : the default program and args to callout to obtain a unique +# # path identifier. Absolute path required +# # default : /usr/lib/udev/scsi_id -g -u -s +# # +# getuid_callout "/usr/lib/udev/scsi_id -g -u -s /block/%n" +# +# # +# # name : prio_callout +# # scope : multipath +# # desc : the default program and args to callout to obtain a path +# # priority value. The ALUA bits in SPC-3 provide an +# # exploitable prio value for example. "none" is a valid value +# # default : (null) +# # +# #prio_callout "/bin/true" +# +# # +# # name : path_checker +# # scope : multipath & multipathd +# # desc : the default method used to determine the paths' state +# # values : readsector0|tur|emc_clariion|hp_sw|directio +# # default : directio +# # +# #path_checker directio +# +# # +# # name : rr_min_io +# # scope : multipath +# # desc : the number of IO to route to a path before switching +# # to the next in the same path group +# # default : 1000 +# # +# rr_min_io 100 +# +# # +# # name : rr_weight +# # scope : multipath +# # desc : if set to priorities the multipath configurator will assign +# # path weights as "path prio * rr_min_io" +# # values : priorities|uniform +# # default : uniform +# # +# rr_weight priorities +# +# # +# # name : failback +# # scope : multipathd +# # desc : tell the daemon to manage path group failback, or not to. +# # 0 means immediate failback, values >0 means deffered failback +# # expressed in seconds. +# # values : manual|immediate|n > 0 +# # default : immediate +# # +# failback manual +# +# # +# # name : no_path_retry +# # scope : multipath & multipathd +# # desc : tell the number of retries until disable queueing, or +# # "fail" means immediate failure (no queueing), +# # "queue" means never stop queueing +# # values : queue|fail|n (>0) +# # default : (null) +# # +# #no_path_retry queue +# +# # +# # name : user_friendly_names +# # scope : multipath +# # desc : If set to "yes", using the bindings file +# # /var/lib/multipath/bindings to assign a persistent and +# # unique alias to the multipath, in the form of mpath. +# # If set to "no" use the WWID as the alias. In either case +# # this be will be overriden by any specific aliases in this +# # file. +# # values : yes|no +# # default : no +# user_friendly_names no +# +#} +# +## +## name : blacklist +## scope : multipath & multipathd +## desc : list of device names to discard as not multipath candidates +## default : cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop +## +#blacklist { +# wwid 26353900f02796769 +# devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*" +# devnode "^hd[a-z][[0-9]*]" +# devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]" +# device { +# vendor DEC.* +# product MSA[15]00 +# } +#} +## +## name : blacklist_exceptions +## scope : multipath & multipathd +## desc : list of device names to be treated as multipath candidates +## even if they are on the blacklist. +## Note: blacklist exceptions are only valid in the same class. +## It is not possible to blacklist devices using the devnode keyword +## and to exclude some devices of them using the wwid keyword. +## default : - +## +#blacklist_exceptions { +# devnode "^dasd[c-d]+[0-9]*" +# wwid "IBM.75000000092461.4d00.34" +# wwid "IBM.75000000092461.4d00.35" +# wwid "IBM.75000000092461.4d00.36" +#} +# +## +## name : multipaths +## scope : multipath & multipathd +## desc : list of multipaths finest-grained settings +## +#multipaths { +# # +# # name : multipath +# # scope : multipath & multipathd +# # desc : container for settings that apply to one specific multipath +# # +# multipath { +# # +# # name : wwid +# # scope : multipath & multipathd +# # desc : index of the container +# # +# wwid 3600508b4000156d700012000000b0000 +# +# # +# # name : alias +# # scope : multipath +# # desc : symbolic name for the multipath +# # +# alias yellow +# +# # +# # name : path_grouping_policy +# # scope : multipath +# # desc : path grouping policy to apply to this multipath +# # values : failover, multibus, group_by_serial +# # default : failover +# # +# path_grouping_policy multibus +# +# # +# # name : path_checker +# # scope : multipathd +# # desc : path checking alorithm to use to check path state +# # values : readsector0|tur|emc_clariion|hp_sw|directio +# # default : directio +# # +# # path_checker directio +# +# # +# # name : path_selector +# # desc : the path selector algorithm to use for this mpath +# # these algo are offered by the kernel mpath target +# # values : "round-robin 0" +# # default : "round-robin 0" +# # +# path_selector "round-robin 0" +# +# # +# # name : failback +# # scope : multipathd +# # desc : tell the daemon to manage path group failback, or not to. +# # 0 means immediate failback, values >0 means deffered failback +# # expressed in seconds. +# # values : manual|immediate|n > 0 +# # default : immediate +# # +# failback manual +# +# # +# # name : no_path_retry +# # scope : multipath & multipathd +# # desc : tell the number of retries until disable queueing, or +# # "fail" means immediate failure (no queueing), +# # "queue" means never stop queueing +# # values : queue|fail|n (>0) +# # default : (null) +# # +# #no_path_retry queue +# +# # +# # name : rr_min_io +# # scope : multipath +# # desc : the number of IO to route to a path before switching +# # to the next in the same path group +# # default : 1000 +# # +# rr_min_io 100 +# } +# multipath { +# wwid 1DEC_____321816758474 +# alias red +# rr_weight priorities +# } +#} +# +## +## name : devices +## scope : multipath & multipathd +## desc : list of per storage controller settings +## overrides default settings (device_maps block) +## overriden by per multipath settings (multipaths block) +## +#devices { +# # +# # name : device +# # scope : multipath & multipathd +# # desc : settings for this specific storage controller +# # +# device { +# # +# # name : vendor, product +# # scope : multipath & multipathd +# # desc : index for the block +# # +# vendor "COMPAQ " +# product "HSV110 (C)COMPAQ" +# +# # +# # name : path_grouping_policy +# # scope : multipath +# # desc : path grouping policy to apply to multipath hosted +# # by this storage controller +# # values : failover = 1 path per priority group +# # multibus = all valid paths in 1 priority +# # group +# # group_by_serial = 1 priority group per detected +# # serial number +# # default : failover +# # +# path_grouping_policy multibus +# +# # +# # name : getuid_callout +# # scope : multipath +# # desc : the program and args to callout to obtain a unique +# # path identifier. Absolute path required +# # default : /usr/lib/udev/scsi_id -g -u -s +# # +# getuid_callout "/usr/lib/udev/scsi_id -g -u -s /block/%n" +# +# # +# # name : prio_callout +# # scope : multipath +# # desc : the program and args to callout to obtain a path +# # weight. Weights are summed for each path group to +# # determine the next PG to use case of failure. +# # "none" is a valid value. +# # default : no callout, all paths equals +# # +# prio_callout "/sbin/mpath_prio_balance_units %d" +# +# # +# # name : path_checker +# # scope : multipathd +# # desc : path checking alorithm to use to check path state +# # values : readsector0|tur|emc_clariion|hp_sw|directio +# # default : directio +# # +# path_checker directio +# +# # +# # name : path_selector +# # desc : the path selector algorithm to use for this mpath +# # these algo are offered by the kernel mpath target +# # values : "round-robin 0" +# # default : "round-robin 0" +# # +# path_selector "round-robin 0" +# +# # +# # name : failback +# # scope : multipathd +# # desc : tell the daemon to manage path group failback, or not to. +# # 0 means immediate failback, values >0 means deffered failback +# # expressed in seconds. +# # values : manual|immediate|n > 0 +# # default : immediate +# # +# failback 30 +# +# # +# # name : rr_min_io +# # scope : multipath +# # desc : the number of IO to route to a path before switching +# # to the next in the same path group +# # default : 1000 +# # +# rr_min_io 100 +# +# # +# # name : product_blacklist +# # scope : multipath & multipathd +# # desc : product strings to blacklist for this vendor +# # default : none +# # +# product_blacklist LUN_Z +# } +# device { +# vendor "COMPAQ " +# product "MSA1000 " +# path_grouping_policy multibus +# path_checker tur +# rr_weight priorities +# } +#} diff --git a/community-testing/multipath-tools/multipathd.rc b/community-testing/multipath-tools/multipathd.rc new file mode 100644 index 000000000..7f5ef5d6a --- /dev/null +++ b/community-testing/multipath-tools/multipathd.rc @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting multipathd" + /usr/bin/multipathd + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon multipathd + stat_done + fi + ;; + stop) + stat_busy "Stopping multipathd" + [ -f /var/run/multipathd.pid ] && kill `cat /var/run/multipathd.pid` >/dev/null 2>&1 + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon multipathd + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community-testing/usb_modeswitch/PKGBUILD b/community-testing/usb_modeswitch/PKGBUILD new file mode 100644 index 000000000..f62176a28 --- /dev/null +++ b/community-testing/usb_modeswitch/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 68773 2012-04-01 19:51:31Z dreisner $ +# Maintainer: Sergej Pupykin + +pkgname=usb_modeswitch +pkgver=1.2.2 +pkgrel=2 +_pkgdata=20120120 +pkgdesc="Activating switchable USB devices on Linux." +arch=('i686' 'x86_64') +url="http://www.draisberghof.de/usb_modeswitch/" +license=('GPL') +depends=('libusb-compat' 'tcl') +makedepends=('gcc' 'make') +backup=("etc/$pkgname.conf") +source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2" + "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2" + "usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt") +md5sums=('4f3d3b9342b59b488089a8a81abda3ae' + 'c899cc9c71bb35f3ec600b7cd1455c65' + 'c12e19e3992b5beac9b6c48555cff660') + +build() { + cd $srcdir/usb-modeswitch-$pkgver/ + make clean + make +} + +package() { + cd $srcdir/usb-modeswitch-$pkgver/ + + mkdir -p $pkgdir/usr/lib/udev + mkdir -p $pkgdir/etc + mkdir -p $pkgdir/usr/share/man/man1 + + make DESTDIR=${pkgdir} UDEVDIR=${pkgdir}/usr/lib/udev install + + cp $srcdir/usb-modeswitch-${pkgver}-device_reference.txt $pkgdir/etc/usb_modeswitch.setup + + cd $srcdir/usb-modeswitch-data-${_pkgdata} + make DESTDIR=$pkgdir install +} diff --git a/community/e-modules-extra-svn/PKGBUILD b/community/e-modules-extra-svn/PKGBUILD index 580228c98..b7a2c76ab 100755 --- a/community/e-modules-extra-svn/PKGBUILD +++ b/community/e-modules-extra-svn/PKGBUILD @@ -2,14 +2,14 @@ # Contributor: Ronald van Haren pkgname=e-modules-extra-svn -pkgver=68423 +pkgver=69748 pkgrel=1 pkgdesc="Extra gadgets for e17" arch=('i686' 'x86_64') groups=('e17-extra-svn') url="http://www.enlightenment.org" license=('BSD') -depends=('e-svn' 'libxkbfile' 'libmpd' 'efreet-svn' 'e_dbus-svn' 'emprint-svn') +depends=('e-svn' 'libxkbfile' 'libmpd' 'efreet-svn' 'e_dbus-svn' 'emprint-svn' 'xorg-setxkbmap') makedepends=('subversion') conflicts=('e-modules-extra') provides=('e-modules-extra') @@ -44,7 +44,7 @@ for i in alarm comp-scale cpu diskio deskshow \ empris engage e-tiling everything-aspell everything-mpris \ everything-pidgin everything-places everything-shotgun \ everything-tracker everything-wallpaper everything-websearch \ - execwatch flame iiirk itask language mail mem \ + execwatch flame iiirk itask mail mem \ moon mpdule net photo places quickaccess \ rain slideshow snow taskbar \ winselector xkbswitch; do @@ -63,7 +63,7 @@ for i in alarm comp-scale cpu diskio deskshow \ empris engage e-tiling everything-aspell everything-mpris \ everything-pidgin everything-places everything-shotgun \ everything-tracker everything-wallpaper everything-websearch \ - execwatch flame iiirk itask language mail mem \ + execwatch flame iiirk itask mail mem \ moon mpdule net photo places quickaccess \ rain slideshow snow taskbar \ winselector xkbswitch; do diff --git a/community/e-svn/PKGBUILD b/community/e-svn/PKGBUILD index e6a66bcd6..7a78acf75 100755 --- a/community/e-svn/PKGBUILD +++ b/community/e-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66580 2012-02-26 10:39:51Z rvanharen $ +# $Id: PKGBUILD 68746 2012-04-01 10:44:46Z rvanharen $ # Maintainer: Ronald van Haren # Contributor: Ronald van Haren pkgname=e-svn -pkgver=68441 +pkgver=69794 pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64') diff --git a/community/e_dbus-svn/PKGBUILD b/community/e_dbus-svn/PKGBUILD index b26bbdcac..4728b0266 100755 --- a/community/e_dbus-svn/PKGBUILD +++ b/community/e_dbus-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66578 2012-02-26 10:38:56Z rvanharen $ +# $Id: PKGBUILD 68744 2012-04-01 10:43:59Z rvanharen $ # Maintainer: Ronald van Haren # Contributor: Ronald van Haren pkgname=e_dbus-svn -pkgver=67284 +pkgver=69484 pkgrel=1 pkgdesc="dbus abstraction layer for e17" arch=('i686' 'x86_64') diff --git a/community/ecore-svn/PKGBUILD b/community/ecore-svn/PKGBUILD index 7fe1f4c34..f15a0ddd8 100755 --- a/community/ecore-svn/PKGBUILD +++ b/community/ecore-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66568 2012-02-26 10:34:45Z rvanharen $ +# $Id: PKGBUILD 68734 2012-04-01 10:40:17Z rvanharen $ # Maintainer: Ronald van Haren # Contributor: Ronald van Haren pkgname=ecore-svn -pkgver=68447 +pkgver=69820 pkgrel=1 pkgdesc="Ecore is an abstraction layer for e17" arch=('i686' 'x86_64') diff --git a/community/edje-svn/PKGBUILD b/community/edje-svn/PKGBUILD index 977adfeb5..cb71570b7 100755 --- a/community/edje-svn/PKGBUILD +++ b/community/edje-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66574 2012-02-26 10:37:03Z rvanharen $ +# $Id: PKGBUILD 68740 2012-04-01 10:42:28Z rvanharen $ # Maintainer: Ronald van Haren # Contributor: Ronald van Haren pkgname=edje-svn -pkgver=68386 +pkgver=69815 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64') diff --git a/community/eet-svn/PKGBUILD b/community/eet-svn/PKGBUILD index 44e56f539..eae57dbb6 100755 --- a/community/eet-svn/PKGBUILD +++ b/community/eet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66564 2012-02-26 10:32:49Z rvanharen $ +# $Id: PKGBUILD 68730 2012-04-01 10:38:24Z rvanharen $ # Maintainer: Ronald van Haren # Contributor: Ronald van Haren pkgname=eet-svn -pkgver=68400 +pkgver=69753 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64') diff --git a/community/eeze-svn/PKGBUILD b/community/eeze-svn/PKGBUILD index 7ad314519..9c38cead6 100644 --- a/community/eeze-svn/PKGBUILD +++ b/community/eeze-svn/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66570 2012-02-26 10:35:35Z rvanharen $ +# $Id: PKGBUILD 68736 2012-04-01 10:41:08Z rvanharen $ # Maintainer: Ronald van Haren # Contributor: Ronald van Haren # Contributor: bluebugs pkgname=eeze-svn -pkgver=67351 +pkgver=69825 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64') diff --git a/community/efreet-svn/PKGBUILD b/community/efreet-svn/PKGBUILD index 55a92e335..fc81c5a3a 100755 --- a/community/efreet-svn/PKGBUILD +++ b/community/efreet-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66576 2012-02-26 10:37:58Z rvanharen $ +# $Id: PKGBUILD 68742 2012-04-01 10:43:18Z rvanharen $ # Maintainer: Ronald van Haren # Contributor: Ronald van Haren pkgname=efreet-svn -pkgver=68229 +pkgver=69816 pkgrel=1 pkgdesc="freedesktop.org specifications for e17" arch=('i686' 'x86_64') diff --git a/community/eina-svn/PKGBUILD b/community/eina-svn/PKGBUILD index 94cd4247e..96ac83d5c 100755 --- a/community/eina-svn/PKGBUILD +++ b/community/eina-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66562 2012-02-26 10:31:57Z rvanharen $ +# $Id: PKGBUILD 68728 2012-04-01 10:37:35Z rvanharen $ # Maintainer: Ronald van Haren # Contributor: Ronald van Haren pkgname=eina-svn -pkgver=68405 +pkgver=69817 pkgrel=1 pkgdesc="E17 file chunk reading/writing library" arch=('i686' 'x86_64') diff --git a/community/elementary-svn/PKGBUILD b/community/elementary-svn/PKGBUILD index 95aab7176..caed34649 100644 --- a/community/elementary-svn/PKGBUILD +++ b/community/elementary-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66584 2012-02-26 10:42:39Z rvanharen $ +# $Id: PKGBUILD 68749 2012-04-01 10:47:30Z rvanharen $ # Maintainer: Ronald van Haren # Contributor: Ronald van Haren pkgname=elementary-svn -pkgver=68444 +pkgver=69796 pkgrel=1 pkgdesc="Enlightenment's basic widget set" arch=('i686' 'x86_64') diff --git a/community/embryo-svn/PKGBUILD b/community/embryo-svn/PKGBUILD index fcd90e53d..9a341972d 100755 --- a/community/embryo-svn/PKGBUILD +++ b/community/embryo-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66572 2012-02-26 10:36:22Z rvanharen $ +# $Id: PKGBUILD 68738 2012-04-01 10:41:49Z rvanharen $ # Maintainer: Ronald van Haren # Contributor: Ronald van Haren pkgname=embryo-svn -pkgver=68421 +pkgver=69822 pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64') diff --git a/community/emprint-svn/PKGBUILD b/community/emprint-svn/PKGBUILD index b1ba55943..410868ce8 100755 --- a/community/emprint-svn/PKGBUILD +++ b/community/emprint-svn/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66582 2012-02-26 10:41:54Z rvanharen $ +# $Id: PKGBUILD 68747 2012-04-01 10:46:48Z rvanharen $ # Maintainer: Ronald van Haren # Contributor: Ronald van Haren diff --git a/community/esdl/PKGBUILD b/community/esdl/PKGBUILD index d488c8ad8..eee11f97b 100644 --- a/community/esdl/PKGBUILD +++ b/community/esdl/PKGBUILD @@ -3,15 +3,16 @@ # Contributor: kappa pkgname=esdl -pkgver=1.2 -pkgrel=2 +pkgver=1.0.1 +pkgrel=1 +epoch=2 arch=('x86_64' 'i686') pkgdesc="SDL and OpenGL bindings for the Erlang programming language" url="http://esdl.sourceforge.net/" license=('custom') depends=('erlang' 'sdl' 'mesa') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.src.tar.gz") -md5sums=('3e96c1d47bd7c1e23285360d88ce1bea') +md5sums=('50230ea81418cb029281a70627a5dd8e') build() { cd "$srcdir/$pkgname-$pkgver" @@ -25,11 +26,11 @@ package() { make INSTALLDIR="$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver" install - # to make wings3d compile - ln -s /usr/lib/erlang/lib/wx-0.99/include/glu.hrl \ - "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver/include/glu.hrl" - ln -s /usr/lib/erlang/lib/wx-0.99/include/gl.hrl \ - "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver/include/gl.hrl" + ## To make wings3d compile with esdl 1.2 + #ln -s /usr/lib/erlang/lib/wx-0.99/include/glu.hrl \ + # "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver/include/glu.hrl" + #ln -s /usr/lib/erlang/lib/wx-0.99/include/gl.hrl \ + # "$pkgdir/usr/lib/erlang/lib/$pkgname-$pkgver/include/gl.hrl" install -Dm644 "$srcdir/$pkgname-$pkgver/license.terms" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" diff --git a/community/evas-svn/PKGBUILD b/community/evas-svn/PKGBUILD index 2c25252e3..b46f942fc 100755 --- a/community/evas-svn/PKGBUILD +++ b/community/evas-svn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66566 2012-02-26 10:33:34Z rvanharen $ +# $Id: PKGBUILD 68732 2012-04-01 10:39:10Z rvanharen $ # Maintainer: Ronald van Haren # Contributor: Ronald van Haren pkgname=evas-svn -pkgver=68448 +pkgver=69774 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64') diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD index 20c9c3eb4..9613a4eb0 100644 --- a/community/lxdm/PKGBUILD +++ b/community/lxdm/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 67372 2012-03-10 19:36:34Z bpiotrowski $ +# $Id: PKGBUILD 68758 2012-04-01 15:10:08Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: AndyRTR # Contributor: kiefer pkgname=lxdm pkgver=0.4.1 -pkgrel=8 +pkgrel=9 pkgdesc="Lightweight Display Manager (part of LXDE)" arch=('i686' 'x86_64') url="http://sourceforge.net/projects/lxdm/" @@ -18,30 +18,33 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' 'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin' 'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown') source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz - lxdm.patch lxdm-conf.patch lxdm-pam.patch Xsession.patch lxdm-daemon) + glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch + lxdm-daemon lxdm-pam) md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' + 'a1e3c46a8bef691bc544028f5b6cfe22' 'baed9055e8825a5511712bc095197519' 'c50dd01b715b0a236407d48066191601' - 'b20fe3c8487a039050986d60e45233a9' 'd2e4a4a22ee2aa1a986be154c647b6c6' - '705f394052fdd0dec22e95321d170de0') + '705f394052fdd0dec22e95321d170de0' + 'b20fe3c8487a039050986d60e45233a9') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver + patch -Np1 -i $srcdir/glib2-2.32.0.patch ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm make - patch -Np0 -i $srcdir/lxdm.patch - patch -Np0 -i $srcdir/lxdm-conf.patch + patch -Np0 -i $srcdir/lxdm.patch + patch -Np0 -i $srcdir/lxdm.conf.patch patch -Np0 -i $srcdir/Xsession.patch } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $srcdir/$pkgname-$pkgver make DESTDIR="${pkgdir}" install - install -m644 ${srcdir}/lxdm-pam.patch ${pkgdir}/etc/pam.d/lxdm + install -m644 ${srcdir}/lxdm-pam ${pkgdir}/etc/pam.d/lxdm install -Dm755 ${srcdir}/lxdm-daemon ${pkgdir}/etc/rc.d/lxdm install -d ${pkgdir}/var/{lib,run}/lxdm diff --git a/community/lxdm/glib2-2.32.0.patch b/community/lxdm/glib2-2.32.0.patch new file mode 100644 index 000000000..cebfc6133 --- /dev/null +++ b/community/lxdm/glib2-2.32.0.patch @@ -0,0 +1,21 @@ +From: dgod +Date: Sun, 25 Dec 2011 07:23:19 +0000 (+0800) +Subject: fix event check bug caused cpu 100% +X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxdm;a=commitdiff_plain;h=d4e41ecb;hp=f0951bdf736026b041001e846d2cb93f7f2852e1 + +fix event check bug caused cpu 100% +--- + +diff --git a/src/lxcom.c b/src/lxcom.c +index 02763eb..18ee12e 100644 +--- a/src/lxcom.c ++++ b/src/lxcom.c +@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout) + + static gboolean lxcom_check(GSource *source) + { +- return TRUE; ++ return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE; + } + + static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data) diff --git a/community/lxdm/lxdm-pam b/community/lxdm/lxdm-pam new file mode 100644 index 000000000..3f5df04a7 --- /dev/null +++ b/community/lxdm/lxdm-pam @@ -0,0 +1,8 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so +auth required pam_unix.so +account required pam_unix.so +session required pam_limits.so +session required pam_unix.so +password required pam_unix.so diff --git a/community/lxdm/lxdm.conf.patch b/community/lxdm/lxdm.conf.patch new file mode 100644 index 000000000..1744e557e --- /dev/null +++ b/community/lxdm/lxdm.conf.patch @@ -0,0 +1,11 @@ +--- data/lxdm.conf.orig 2011-11-01 17:57:59.208757577 +0100 ++++ data/lxdm.conf 2011-11-01 18:03:55.608741945 +0100 +@@ -27,7 +27,7 @@ + gtk_theme=Clearlooks + + ## background of the greeter +-bg=/usr/share/backgrounds/default.png ++# bg=/usr/share/backgrounds/default.png + + ## if show bottom pane + bottom_pane=1 diff --git a/community/ristretto/PKGBUILD b/community/ristretto/PKGBUILD index d9baabc05..4dbc96b42 100644 --- a/community/ristretto/PKGBUILD +++ b/community/ristretto/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67268 2012-03-06 06:17:03Z bpiotrowski $ +# $Id: PKGBUILD 68760 2012-04-01 18:23:28Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: AndyRTR # Contributor: Ronald van Haren pkgname=ristretto -pkgver=0.3.5 +pkgver=0.3.6 pkgrel=1 pkgdesc="A fast and lightweight picture-viewer for Xfce" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('intltool') groups=('xfce4-goodies') install=ristretto.install source=("http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2") -md5sums=('3bfdf129926236a45c58d7afdbb703b7') +md5sums=('8196617feb84b73247242910b64935e8') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/community/sakura/PKGBUILD b/community/sakura/PKGBUILD index 16f5c5794..e1db2e9fb 100644 --- a/community/sakura/PKGBUILD +++ b/community/sakura/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 66893 2012-02-29 21:54:35Z rvanharen $ +# $Id: PKGBUILD 68725 2012-04-01 09:02:38Z rvanharen $ # Maintainer: Ronald van Haren # Contributor: Dmitry N. Shilov pkgname=sakura -pkgver=3.0.0 +pkgver=3.0.3 pkgrel=1 pkgdesc="A terminal emulator based on GTK and VTE" arch=('i686' 'x86_64') @@ -11,18 +11,13 @@ url="https://launchpad.net/sakura" license=('GPL') depends=('vte3' 'libxft' 'desktop-file-utils') makedepends=('cmake') -source=(http://pleyades.net/david/projects/$pkgname/$pkgname-$pkgver.tar.bz2 - "linker.patch") +source=("https://launchpad.net/sakura/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") install=sakura.install -sha1sums=('2ac4024b40074fb048e9b75cd7ea351b1829c5ee' - '781058944c572b840e68a55a0fe86e97c4ac5296') +sha1sums=('e060131fd5aaf35be501bdc2a5cc29d4cffa9717') build() { cd $srcdir/${pkgname}-${pkgver} - # missing linker - patch -Np1 -i ${srcdir}/linker.patch - # Set default font size a bit smaller sed -i 's|#define DEFAULT_FONT "Bitstream Vera Sans Mono 14"|#define DEFAULT_FONT "Bitstream Vera Sans Mono 10"|g' src/sakura.c diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD new file mode 100644 index 000000000..abaced38c --- /dev/null +++ b/community/wings3d/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: kappa + +pkgname=wings3d +_pkgname=wings +pkgver=1.4.1 +pkgrel=5 +pkgdesc="3D modeling program" +arch=('x86_64' 'i686') +url="http://www.wings3d.com/" +license=('GPL') +depends=('esdl' 'bash') +makedepends=('setconf' 'gendesk') +optdepends=('povray: rendering support via POV-Ray' + 'kerkythea: rendering support via Kerkythea') +replaces=('wings' 'wings-devel') +install=$pkgname.install +source=("http://downloads.sourceforge.net/wings/$_pkgname-$pkgver.tar.bz2" + "$pkgname" + "$pkgname.png") +sha256sums=('51aea431e18935e5634ea673caa945f586db2203855554d8dcab5e9545f2789a' + '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e' + 'ad49fded5e503131ee0e2e03a6db0974aa60f50e1ec6cd697fcacef126c40f52') +_genericname=('3D Modeler') + +build() { + cd "$srcdir" + gendesk + setconf "$pkgname.desktop" Categories "Graphics;3DGraphics;" + + cd "$_pkgname-$pkgver" + export ESDL_PATH=$(echo /usr/lib/erlang/lib/esdl-*) + make + make lang +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + mkdir -p "$pkgdir/usr/lib/$pkgname" + for subdir in ebin fonts patches plugins shaders textures; do + cp -r "$srcdir/$_pkgname-$pkgver/$subdir/" "$pkgdir/usr/lib/$pkgname" + done + + install -D -m 755 "$srcdir/wings3d" "$pkgdir/usr/bin/wings3d" + install -D -m 644 "$srcdir/wings3d.desktop" \ + "$pkgdir/usr/share/applications/wings3d.desktop" + install -D -m 644 "$srcdir/wings3d.png" \ + "$pkgdir/usr/share/pixmaps/wings3d.png" + install -D -m 644 license.terms \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/wings3d/wings3d b/community/wings3d/wings3d new file mode 100644 index 000000000..c0fd3b2fb --- /dev/null +++ b/community/wings3d/wings3d @@ -0,0 +1,2 @@ +#!/bin/sh +erl -noinput -smp disable -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin -run wings_start start_halt ${1+"$@"} diff --git a/community/wings3d/wings3d.install b/community/wings3d/wings3d.install new file mode 100644 index 000000000..98f3ea190 --- /dev/null +++ b/community/wings3d/wings3d.install @@ -0,0 +1,14 @@ +post_upgrade() { + #gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor + update-desktop-database -q +} + +post_install() { + post_upgrade +} + +post_remove() { + post_upgrade +} + +# vim:set ts=2 sw=2 et: diff --git a/community/wings3d/wings3d.png b/community/wings3d/wings3d.png new file mode 100644 index 000000000..45a1140bf Binary files /dev/null and b/community/wings3d/wings3d.png differ diff --git a/extra/cups-filters/PKGBUILD b/extra/cups-filters/PKGBUILD new file mode 100644 index 000000000..a3e6d0b54 --- /dev/null +++ b/extra/cups-filters/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 155005 2012-04-01 10:10:35Z andyrtr $ +# Maintainer: Andreas Radke + +pkgname=cups-filters +pkgver=1.0.11 +pkgrel=1 +pkgdesc="OpenPrinting CUPS Filters" +arch=('i686' 'x86_64') +url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" +license=('GPL') +groups=() +depends=('ghostscript' 'lcms2' 'poppler') +makedepends=() +optdepends=() +provides=() +conflicts=() +replaces=() +backup=() +#options=(!makeflags) +install= +source=(http://www.openprinting.org/download/cups-filters/$pkgname-$pkgver.tar.gz) +md5sums=('70789c052deaa50fb00cae1b4c24f9f4') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --sysconfdir=/etc + make +} + +#check() { +# cd "$srcdir/$pkgname-$pkgver" +# make -k check +#} + +package() { + cd "$srcdir/$pkgname-$pkgver" + #make DESTDIR="$pkgdir/" install + make install BUILDROOT="$pkgdir/" + # drop static lib + rm -f ${pkgdir}/usr/lib/*.a +} diff --git a/extra/fftw/PKGBUILD b/extra/fftw/PKGBUILD index 700a817f2..053915392 100644 --- a/extra/fftw/PKGBUILD +++ b/extra/fftw/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 151333 2012-02-25 14:36:24Z pierre $ +# $Id: PKGBUILD 154980 2012-04-01 07:06:27Z ronald $ # Maintainer: Ronald van Haren # Contributor: damir pkgname=fftw -pkgver=3.3 -pkgrel=2 +pkgver=3.3.1 +pkgrel=1 pkgdesc="A library for computing the discrete Fourier transform (DFT)" arch=('i686' 'x86_64') license=('GPL2') @@ -14,7 +14,7 @@ makedepends=('gcc-fortran') options=('!libtool') source=("http://www.fftw.org/${pkgname}-${pkgver}.tar.gz") install=fftw.install -sha1sums=('e44493ba4babeacba184568e727876d9aed44205') +sha1sums=('3fecc492f576503a6a509d2073bd82b3fe0aef13') # notes: # http://www.fftw.org/fftw2_doc/fftw_6.html#SEC69 diff --git a/extra/openal/PKGBUILD b/extra/openal/PKGBUILD index 80b85a2c9..157a25d45 100644 --- a/extra/openal/PKGBUILD +++ b/extra/openal/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 149424 2012-02-07 16:51:11Z heftig $ +# $Id: PKGBUILD 155305 2012-04-01 14:23:52Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae -# Contributer: Jason Chu +# Contributor: Jason Chu pkgname=openal -pkgver=1.13 -pkgrel=3 +pkgver=1.14 +pkgrel=1 pkgdesc="A cross-platform 3D audio library" arch=(i686 x86_64) url="http://www.openal.org/" @@ -14,16 +14,16 @@ depends=(glibc) makedepends=(alsa-lib sdl pkgconfig cmake libpulse) options=('!libtool') source=(http://kcat.strangesoft.net/openal-releases/openal-soft-$pkgver.tar.bz2) -md5sums=('58b7d2809790c70681b825644c5f3614') +md5sums=('3d8b86c21a2f87a2a5e60f78f3b3f03d') build() { - cd "$srcdir/$pkgname-soft-$pkgver/build" + cd $pkgname-soft-$pkgver/build cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release .. make } package() { - cd "$srcdir/$pkgname-soft-$pkgver" + cd $pkgname-soft-$pkgver make -C build DESTDIR="$pkgdir/" install install -Dm644 alsoftrc.sample "$pkgdir/etc/openal/alsoft.conf.sample" } diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD index 27dd7734f..639a27964 100644 --- a/extra/p11-kit/PKGBUILD +++ b/extra/p11-kit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 150593 2012-02-18 17:27:00Z ibiru $ +# $Id: PKGBUILD 154982 2012-04-01 07:46:19Z ibiru $ # Maintainer: Ionut Biru pkgname=p11-kit -pkgver=0.11 +pkgver=0.12 pkgrel=1 pkgdesc="Library to work with PKCS#11 modules" arch=(i686 x86_64) @@ -11,7 +11,7 @@ license=('BSD') depends=(glibc) options=(!libtool) source=($url/releases/$pkgname-$pkgver.tar.gz) -md5sums=('bd45d00c5c4d4b171791003bf5344d6f') +md5sums=('66baf7ddde982d1b7294d3bd63be7446') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD index 909bd3e9e..c51ab4609 100644 --- a/extra/qrencode/PKGBUILD +++ b/extra/qrencode/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148902 2012-02-05 11:54:55Z ibiru $ +# $Id: PKGBUILD 155309 2012-04-01 16:17:46Z bluewind $ # Maintainer: Florian Pritz< flo@xinu.at> # Contributor: Dany Martineau pkgname=qrencode -pkgver=3.2.0 -pkgrel=2 +pkgver=3.3.0 +pkgrel=1 pkgdesc="C library for encoding data in a QR Code symbol." arch=(i686 x86_64) depends=('libpng>=1.5.0') @@ -13,7 +13,7 @@ url="http://megaui.net/fukuchi/works/qrencode/index.en.html" license=('GPL') options=(!libtool) source=(http://megaui.net/fukuchi/works/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('7e90615eb314abcd2eb2eab5c8155b97') +md5sums=('b7531107ffd8e4f9ce262e87893b01ca') build() { cd "${srcdir}/$pkgname-$pkgver" diff --git a/extra/stellarium/PKGBUILD b/extra/stellarium/PKGBUILD index d32a60fc4..b2f852a71 100644 --- a/extra/stellarium/PKGBUILD +++ b/extra/stellarium/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142487 2011-11-10 19:40:07Z ronald $ +# $Id: PKGBUILD 154997 2012-04-01 09:19:54Z ronald $ # Maintainer: Ronald van Haren # Contributor: Damir Perisa pkgname=stellarium -pkgver=0.11.1 +pkgver=0.11.2 pkgrel=1 pkgdesc="A stellarium with great graphics and a nice database of sky-objects" arch=("i686" "x86_64") @@ -14,7 +14,7 @@ makedepends=('cmake' 'boost') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz stellarium.desktop stellarium.png) -sha1sums=('e721a9cef0c736354c477fdb25cce607a9a3b52e' +sha1sums=('ed77c612b53d74dc2264b1be05f19d05950a1771' 'c9cc79212542238227b5bd6af99f60fe056f4ab2' 'b890d3b6c4dcfcfcc696514202af11b2a50c0fea') diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD index 2f70efe32..ca3c36225 100644 --- a/extra/texmacs/PKGBUILD +++ b/extra/texmacs/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 141258 2011-10-27 15:06:09Z ronald $ +# $Id: PKGBUILD 154990 2012-04-01 08:33:19Z ronald $ # Maintainer: Ronald van Haren # Contributor: Damir Perisa pkgname=texmacs -pkgver=1.0.7.14 +pkgver=1.0.7.15 pkgrel=1 pkgdesc="Free scientific text editor, inspired by TeX and GNU Emacs. WYSIWYG editor TeX-fonts and CAS-interface (Giac, GTybalt, Macaulay 2, Maxima, Octave, Pari, Qcl, R and Yacas) in one." arch=('i686' 'x86_64') url="http://www.texmacs.org/" license=('GPL') -depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2') +depends=('perl' 'guile' 'texlive-core' 'python2' 'libxext' 'freetype2' 'shared-mime-info' 'desktop-file-utils') # do not remove texlive-core dependency, as it is needed! -optdepends=('transfig: convert images using fig2ps') +optdepends=('transfig: convert images using fig2ps' 'awk: conversion of some files') #source=(ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-${pkgver}-src.tar.gz) source=(http://www.texmacs.org/Download/ftp/tmftp/source/TeXmacs-${pkgver}-src.tar.gz) -sha1sums=('5bbe0458d2ab73fa8cea8e12fee788b17b6f279a') +install=texmacs.install +sha1sums=('d75d55fcf0c06bf7fd5d9afd1031b9cf8413cbd3') build() { cd ${srcdir}/TeXmacs-${pkgver}-src diff --git a/extra/texmacs/texmacs.install b/extra/texmacs/texmacs.install new file mode 100644 index 000000000..7486663d6 --- /dev/null +++ b/extra/texmacs/texmacs.install @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime +} + +post_upgrade() { + post_install +} + +post_remove () { + post_install +} + + diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD index d106536da..906625b4d 100644 --- a/extra/wxmaxima/PKGBUILD +++ b/extra/wxmaxima/PKGBUILD @@ -4,15 +4,16 @@ # Contributor: Vinay S Shastry pkgname=wxmaxima -pkgver=11.08.0 -pkgrel=2 +pkgver=12.01.0 +pkgrel=1 pkgdesc="A wxWidgets GUI for the computer algebra system Maxima" arch=('i686' 'x86_64') url="http://wxmaxima.sourceforge.net/" license=('GPL2') -depends=('maxima' 'libxml2' 'wxgtk') +depends=('maxima' 'libxml2' 'wxgtk' 'shared-mime-info' 'desktop-file-utils') source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz) -sha1sums=('852a772e4b982bc355120cc95ee6f3d600ce011b') +install=wxmaxima.install +sha1sums=('d80002ddea3260b0f3315072f23b4bb3cce3a10a') build() { cd "${srcdir}/wxMaxima-${pkgver}" diff --git a/extra/wxmaxima/wxmaxima.install b/extra/wxmaxima/wxmaxima.install new file mode 100644 index 000000000..7486663d6 --- /dev/null +++ b/extra/wxmaxima/wxmaxima.install @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime +} + +post_upgrade() { + post_install +} + +post_remove () { + post_install +} + + diff --git a/extra/xfig/PKGBUILD b/extra/xfig/PKGBUILD index 0527c33ee..12bd8bd37 100644 --- a/extra/xfig/PKGBUILD +++ b/extra/xfig/PKGBUILD @@ -1,28 +1,27 @@ -# $Id: PKGBUILD 148664 2012-02-05 11:46:09Z ibiru $ +# $Id: PKGBUILD 155348 2012-04-02 00:26:21Z eric $ # Maintainer: Eric Bélanger pkgname=xfig pkgver=3.2.5b -pkgrel=7 +pkgrel=8 pkgdesc="An interactive drawing tool" arch=('i686' 'x86_64') url="http://www.xfig.org/userman/" license=('custom') -depends=('libpng' 'libjpeg' 'xaw3d>=1.6' 'libxi' 'desktop-file-utils' 'gsfonts' 'libxpm') +depends=('libpng' 'libjpeg' 'libxaw' 'libxi' 'desktop-file-utils' 'gsfonts') makedepends=('imake') optdepends=('transfig: to use the frontend to convert fig files') options=('!makeflags' '!emptydirs') install=xfig.install source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz \ xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch \ - xfig-3.2.5-enable-Xaw3d.patch xfig-3.2.5-urwfonts.patch \ + xfig-3.2.5-urwfonts.patch \ xfig-3.2.5-fhs.patch xfig-3.2.5-missing-protos.patch \ xfig.3.2.5-modularX.patch xfig-3.2.5b-fix-eps-reading.patch \ xfig-3.2.5b-libpng-1.5.patch LICENSE xfig.desktop) sha1sums=('0730d7e6bc217c0de02682efb0078821512bb542' '926ad99c7221baa4aa9e9737722958860b2700fc' 'b7c03fb70066ff476a4039a8c0f8930c15edef68' - '33bff26b42ce164e79de11808b5b34b363f0d59f' 'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb' '39bec6bac9746b643b05fd1286826113ede07ff6' 'bd76cd50be6a5789cfd6f182309cfd7056be04f3' @@ -37,12 +36,12 @@ build() { patch -p1 < ../xfig-3.2.4-redhat.patch patch -p1 < ../xfig-3.2.5-fhs.patch patch -p1 < ../xfig.3.2.5-modularX.patch - patch -p1 < ../xfig-3.2.5-enable-Xaw3d.patch patch -p1 < ../xfig-3.2.5-color-resources.patch patch -p1 < ../xfig-3.2.5-urwfonts.patch patch -p1 < ../xfig-3.2.5-missing-protos.patch patch -p1 < ../xfig-3.2.5b-fix-eps-reading.patch patch -p1 < ../xfig-3.2.5b-libpng-1.5.patch + sed -i 's/#define XAW3D/XCOMM #define XAW3D/' Imakefile chmod 755 Libraries xmkmf diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 426450446..e834caea0 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153390 2012-03-12 20:55:40Z andyrtr $ +# $Id: PKGBUILD 154986 2012-04-01 08:22:31Z andyrtr $ # Maintainer: Jan de Groot pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') -pkgver=1.12.0 +pkgver=1.12.0.901 pkgrel=1 arch=('i686' 'x86_64') license=('custom') @@ -20,9 +20,9 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run xvfb-run.1 10-quirks.conf) -sha1sums=('5f48db767f71e9f58ded6ff356f3b8340820e524' - 'f19658773d3fa4dc468bb28f9f01866acce71540' - '962fecc159c128728f14e8ba231c5b00391ff4ac' +sha1sums=('80465deb799cdc6b7c2cc7d61e7ad8b4bc3892d7' + '63836e5cfb4ae7353fb2e31239a544409c7ead32' + '175de5630b43dbc97778adfba5563b7fdd77f11f' 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' '6838fc00ef4618c924a77e0fb03c05346080908a' '993798f3d22ad672d769dae5f48d1fa068d5578f') diff --git a/extra/xorg-server/autoconfig-nvidia.patch b/extra/xorg-server/autoconfig-nvidia.patch index 9ed9b7aee..6d5220ac7 100644 --- a/extra/xorg-server/autoconfig-nvidia.patch +++ b/extra/xorg-server/autoconfig-nvidia.patch @@ -1,11 +1,11 @@ diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c --- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000 +++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000 -@@ -1111,7 +1111,23 @@ - { - int idx = 0; +@@ -1144,7 +1144,23 @@ + int idx = 0; + #ifdef __linux__ -- driverList[idx++] = "nouveau"; +- driverList[idx++] = "nouveau"; + switch (dev->device_id) + { + /* NV1 */ @@ -24,5 +24,5 @@ diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-serve + break; + } #endif - driverList[idx++] = "nv"; - break; + driverList[idx++] = "nv"; + break; diff --git a/extra/xorg-server/autoconfig-sis.patch b/extra/xorg-server/autoconfig-sis.patch index d936efaaa..0b50049db 100644 --- a/extra/xorg-server/autoconfig-sis.patch +++ b/extra/xorg-server/autoconfig-sis.patch @@ -1,10 +1,12 @@ --- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 +++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 -@@ -1140,7 +1140,15 @@ - driverList[0] = "savage"; break; - } - break; -- case 0x1039: driverList[0] = "sis"; break; +@@ -1200,9 +1200,15 @@ + break; + } + break; +- case 0x1039: +- driverList[0] = "sis"; +- break; + case 0x1039: + switch (dev->device_id) + { @@ -14,6 +16,6 @@ + driverList[0] = "sis"; break; + } + break; - case 0x126f: driverList[0] = "siliconmotion"; break; - case 0x121a: - if (dev->device_id < 0x0003) + case 0x126f: + driverList[0] = "siliconmotion"; + break; diff --git a/extra/xorg-xlsatoms/PKGBUILD b/extra/xorg-xlsatoms/PKGBUILD index eff438f56..eef31393d 100644 --- a/extra/xorg-xlsatoms/PKGBUILD +++ b/extra/xorg-xlsatoms/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151019 2012-02-24 13:25:13Z allan $ +# $Id: PKGBUILD 154999 2012-04-01 10:01:56Z andyrtr $ # Maintainer: Jan de Groot pkgname=xorg-xlsatoms -pkgver=1.1.0 -pkgrel=3 +pkgver=1.1.1 +pkgrel=1 pkgdesc="List interned atoms defined on server" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libxcb') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xlsatoms-${pkgver}.tar.bz2) -sha1sums=('2982df6844d60cd12a09208808ab6baa767fe35f') +sha1sums=('271880bf9dcd37b85b08e5f4a43e6015747b45e1') build() { cd "${srcdir}/xlsatoms-${pkgver}" diff --git a/extra/xorg-xpr/PKGBUILD b/extra/xorg-xpr/PKGBUILD index b0915507e..11ba4bad5 100644 --- a/extra/xorg-xpr/PKGBUILD +++ b/extra/xorg-xpr/PKGBUILD @@ -1,24 +1,21 @@ -# $Id: PKGBUILD 151009 2012-02-24 13:13:47Z allan $ +# $Id: PKGBUILD 155001 2012-04-01 10:04:57Z andyrtr $ # Maintainer: Jan de Groot pkgname=xorg-xpr -pkgver=1.0.3 -pkgrel=3 +pkgver=1.0.4 +pkgrel=1 pkgdesc="Print an X window dump from xwd" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') -depends=('libx11' 'libxmu') +depends=('libx11' 'libxmu' 'sh') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') -source=(http://xorg.freedesktop.org/archive/individual/app/xpr-${pkgver}.tar.bz2 - copyright.patch) -sha1sums=('9dbd0ff136b612285e00d92d0c7675a4207b1c4a' - 'd2649781330400b83cf3553d9cfd6e02dd93a2bd') +source=(http://xorg.freedesktop.org/archive/individual/app/xpr-${pkgver}.tar.bz2) +sha1sums=('0645404e9aa2c9f979e4d006c483633bf6cfc2d9') build() { cd "${srcdir}/xpr-${pkgver}" - patch -Np1 -i "${srcdir}/copyright.patch" ./configure --prefix=/usr make } diff --git a/extra/xorg-xwud/PKGBUILD b/extra/xorg-xwud/PKGBUILD index ebeaf50a7..b2a30dc07 100644 --- a/extra/xorg-xwud/PKGBUILD +++ b/extra/xorg-xwud/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150995 2012-02-24 12:54:53Z allan $ +# $Id: PKGBUILD 155003 2012-04-01 10:06:45Z andyrtr $ # Maintainer: Jan de Groot pkgname=xorg-xwud -pkgver=1.0.3 -pkgrel=3 +pkgver=1.0.4 +pkgrel=1 pkgdesc="X Window System image undumping utility" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libx11') makedepends=('xorg-util-macros') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xwud-${pkgver}.tar.bz2) -sha1sums=('2e706d50c7039e3daa4963d36ab703e48aa652ed') +sha1sums=('786cd4b18bf576fae3ffd417545b1394b27c7f06') build() { cd "${srcdir}/xwud-${pkgver}" diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD new file mode 100644 index 000000000..834b0a8b8 --- /dev/null +++ b/libre/abiword-libre/PKGBUILD @@ -0,0 +1,88 @@ +# $Id: PKGBUILD 146945 2012-01-19 14:58:28Z giovanni $ +# Maintainer: Giovanni Scafora +# Contributor: Maël Lavault +# Contributor (Parabola): André Silva + +_pkgbase=abiword +pkgbase=abiword-libre +pkgname=('abiword-libre' 'abiword-libre-plugins') +pkgver=2.8.6 +pkgrel=7 +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +url="http://www.abisource.com" +makedepends=('pkgconfig' 'asio' 'boost' 'fribidi' 'goffice' 'libwmf' 'wv' 'link-grammar' 'gtkmathview' + 'aiksaurus' 'libxslt' 'enchant' 'libots' 'libwpg' 'librsvg' 'loudmouth' 'libsoup' 'ttf-liberation') +options=('!makeflags' '!libtool') +source=("http://www.abisource.com/downloads/${_pkgbase}/${pkgver}/source/${_pkgbase}-${pkgver}.tar.gz" + 'compat_libwpg_0_9.patch' + 'abiword-2.8.6-no-undefined.patch' + 'abiword-2.8.6-libpng15.patch' + 'liberation-fonts.patch') +md5sums=('f883b0a7f26229a9c66fd6a1a94381aa' + '09446a2ebba8288fc611e88f7cf17298' + '42e2614b6e0aad457d91f6ce20b6f225' + '40e370e7e88c5437140ef18037abfbd3' + '880b17db6f249d977d2a7cd012d9ce02') +conflicts=('abiword') +replaces=('abiword') +provides=("abiword=$pkgver") + +build() { + cd "${srcdir}/${_pkgbase}-${pkgver}" + + patch -Np1 -i "${srcdir}/compat_libwpg_0_9.patch" + # fix a gcc 4.6.x build issue, patch from Fedora + patch -Np1 -i "${srcdir}/abiword-2.8.6-no-undefined.patch" + patch -Np0 -i "${srcdir}/abiword-2.8.6-libpng15.patch" + patch -Np1 -i "${srcdir}/liberation-fonts.patch" + + libtoolize --force + autoreconf + + ./configure --prefix=/usr \ + --enable-clipart \ + --enable-templates \ + --enable-collab-backend-xmpp \ + --enable-collab-backend-tcp \ + --enable-collab-backend-service \ + --disable-collab-backend-sugar \ + --enable-plugins --without-gnomevfs \ + --with-gio \ + --with-goffice \ + --disable-static \ + --with-psiconv-config=/nothere + make +} + +package_abiword-libre() { + pkgdesc="A fully-featured word processor that doesn't recommend unfree fonts" + depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils') + install=$pkgname.install + optdepends=('abiword-plugins') + conflicts=("abiword-plugins<${pkgver}-${pkgrel}") + + cd "${srcdir}/${_pkgbase}-${pkgver}" + sed -i plugins/Makefile \ + -e 's/ collab / /' \ + -e 's/ wpg / /' \ + -e 's/ wmf / /' \ + -e 's/ grammar / /' \ + -e 's/ mathview / /' \ + -e 's/ aiksaurus / /' \ + -e 's/ latex / /' \ + -e 's/ ots / /' \ + -e 's/ wordperfect / /' + make DESTDIR="${pkgdir}" install +} + +package_abiword-libre-plugins() { + pkgdesc="Additional plugins for Abiword" + depends=("abiword-libre=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' + 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf') + + cd "${srcdir}/${_pkgbase}-${pkgver}/plugins" + for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do + make -C ${dir} DESTDIR="${pkgdir}" install + done +} diff --git a/libre/abiword-libre/abiword-2.8.6-libpng15.patch b/libre/abiword-libre/abiword-2.8.6-libpng15.patch new file mode 100644 index 000000000..7eded4c83 --- /dev/null +++ b/libre/abiword-libre/abiword-2.8.6-libpng15.patch @@ -0,0 +1,100 @@ +$NetBSD: patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $ + +Fix build with png-1.5. + +--- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig 2009-06-25 04:02:06.000000000 +0000 ++++ plugins/bmp/xp/ie_impGraphic_BMP.cpp +@@ -191,7 +191,10 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap + + /* Clean Up Memory Used */ + +- FREEP(m_pPNGInfo->palette); ++ png_colorp palette; ++ int num_palette; ++ png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette ); ++ FREEP(palette); + DELETEP(pBB); + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); + +@@ -313,7 +316,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); +@@ -332,7 +335,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P + UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB) + { + /* Reset error handling for libpng */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); + return UT_ERROR; +@@ -372,7 +375,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P + UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB) + { + /* Reset error handling for libpng */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); + return UT_ERROR; + +$NetBSD: patch-plugins_garble_xp_abiword-garble-png.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $ + +Fix build with png-1.5. + +--- plugins/garble/xp/abiword-garble-png.cpp.orig 2009-09-05 15:34:44.000000000 +0000 ++++ plugins/garble/xp/abiword-garble-png.cpp +@@ -79,7 +79,7 @@ bool abiword_document::garble_png( void* + png_set_strip_alpha( png_ptr ); + png_set_interlace_handling( png_ptr ); + png_set_bgr( png_ptr ); +- rowbytes = info_ptr->rowbytes; ++ rowbytes = png_get_rowbytes( png_ptr, info_ptr ); + png_destroy_read_struct( &png_ptr, &info_ptr, NULL ); + } + +$NetBSD: patch-af,v 1.12 2011/01/15 15:07:11 wiz Exp $ + +Fix build with png-1.5. + +--- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig 2009-07-01 04:02:04.000000000 +0000 ++++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp +@@ -185,7 +185,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import + /** needed for the stejmp context */ + UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf) + { +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + DELETEP(m_pPngBB); + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); +@@ -446,7 +446,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(m_pPNG->jmpbuf)) ++ if (setjmp(png_jmpbuf(m_pPNG))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_write_struct(&m_pPNG, &m_pPNGInfo); +$NetBSD: patch-ae,v 1.21 2011/01/15 15:07:11 wiz Exp $ + +Fix build with png-1.5. + +--- src/af/util/xp/ut_png.cpp.orig 2008-02-24 03:33:07.000000000 +0000 ++++ src/af/util/xp/ut_png.cpp +@@ -71,7 +71,7 @@ bool UT_PNG_getDimensions(const UT_ByteB + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if (setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(png_ptr))) + { + /* Free all of the memory associated with the png_ptr and info_ptr */ + png_destroy_read_struct(&png_ptr, &info_ptr, static_cast(NULL)); diff --git a/libre/abiword-libre/abiword-2.8.6-no-undefined.patch b/libre/abiword-libre/abiword-2.8.6-no-undefined.patch new file mode 100644 index 000000000..c07000edb --- /dev/null +++ b/libre/abiword-libre/abiword-2.8.6-no-undefined.patch @@ -0,0 +1,21 @@ +diff -u -r abiword-2.8.6.orig/src/Makefile.am abiword-2.8.6/src/Makefile.am +--- abiword-2.8.6.orig/src/Makefile.am 2009-09-09 15:11:01.000000000 +0200 ++++ abiword-2.8.6/src/Makefile.am 2011-08-02 23:35:51.904761961 +0200 +@@ -107,7 +107,7 @@ + + AbiWord_LDFLAGS = \ + $(DEPS_LIBS) \ +- --no-undefined \ ++ -Wl,--no-undefined \ + -avoid-version \ + -export-dynamic \ + -headerpad_max_install_names +@@ -129,7 +129,7 @@ + + abiword_LDFLAGS = \ + $(platform_ldflags) \ +- --no-undefined \ ++ -Wl,--no-undefined \ + -avoid-version \ + -export-dynamic + diff --git a/libre/abiword-libre/abiword-libre.install b/libre/abiword-libre/abiword-libre.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/libre/abiword-libre/abiword-libre.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/libre/abiword-libre/compat_libwpg_0_9.patch b/libre/abiword-libre/compat_libwpg_0_9.patch new file mode 100644 index 000000000..cf36e188e --- /dev/null +++ b/libre/abiword-libre/compat_libwpg_0_9.patch @@ -0,0 +1,371 @@ +diff -Nur abiword-2.8.6.orig//plugin-configure.m4 abiword-2.8.6/plugin-configure.m4 +--- abiword-2.8.6.orig//plugin-configure.m4 2010-06-13 14:17:27.000000000 -0700 ++++ abiword-2.8.6/plugin-configure.m4 2010-12-06 13:59:43.083048588 -0800 +@@ -794,7 +794,7 @@ + AC_SUBST([OPENXML_LIBS]) + + +-wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" ++wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" + wpg_deps="no" + + if test "$enable_wpg" != ""; then +@@ -1497,8 +1497,8 @@ + AC_SUBST([EML_LIBS]) + + +-wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req" +-wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0' ++wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" ++wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' + wordperfect_deps="no" + + WORDPERFECT_CFLAGS= +diff -Nur abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 abiword-2.8.6/plugins/wordperfect/plugin.m4 +--- abiword-2.8.6.orig//plugins/wordperfect/plugin.m4 2010-05-30 07:50:46.000000000 -0700 ++++ abiword-2.8.6/plugins/wordperfect/plugin.m4 2010-12-06 13:59:53.929715254 -0800 +@@ -1,6 +1,6 @@ + +-wordperfect_pkgs="libwpd-0.8 >= 0.8.0 $gsf_req" +-wordperfect_wps_pkgs='libwps-0.1 >= 0.1.0' ++wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req" ++wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0' + wordperfect_deps="no" + + WORDPERFECT_CFLAGS= +diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp +--- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.cpp 2010-02-06 13:06:11.000000000 -0800 ++++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.cpp 2010-12-06 13:59:53.926381921 -0800 +@@ -60,7 +60,7 @@ + + // Stream class + +-#include ++#include + + #include + #include +@@ -70,12 +70,7 @@ + #include + #endif + +-class AbiWordperfectInputStream : +-#ifdef HAVE_LIBWPS +- public WPSInputStream +-#else +- public WPXInputStream +-#endif ++class AbiWordperfectInputStream : public WPXInputStream + { + public: + AbiWordperfectInputStream(GsfInput *input); +@@ -86,7 +81,7 @@ + + virtual WPXInputStream * getDocumentOLEStream(const char * name); + +- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead); ++ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); + virtual int seek(long offset, WPX_SEEK_TYPE seekType); + virtual long tell(); + virtual bool atEOS(); +@@ -98,11 +93,7 @@ + }; + + AbiWordperfectInputStream::AbiWordperfectInputStream(GsfInput *input) : +-#ifdef HAVE_LIBWPS +- WPSInputStream(), +-#else +- WPXInputStream(true), +-#endif ++ WPXInputStream(), + m_input(input), + m_ole(NULL) + { +@@ -117,9 +108,9 @@ + g_object_unref(G_OBJECT(m_input)); + } + +-const uint8_t * AbiWordperfectInputStream::read(size_t numBytes, size_t &numBytesRead) ++const unsigned char * AbiWordperfectInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) + { +- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL); ++ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL); + + if (buf == NULL) + numBytesRead = 0; +@@ -256,19 +247,12 @@ + { + AbiWordperfectInputStream gsfInput(input); + +- WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput, true); ++ WPDConfidence confidence = WPDocument::isFileFormatSupported(&gsfInput); + + switch (confidence) + { + case WPD_CONFIDENCE_NONE: +- // libwpd > 0.7.1 reports POOR if the text file is plain text (that _could_ be a WP4x document) +- // however, we'll let the text importer handle such cases +- case WPD_CONFIDENCE_POOR: + return UT_CONFIDENCE_ZILCH; +- case WPD_CONFIDENCE_LIKELY: +- return UT_CONFIDENCE_SOSO; +- case WPD_CONFIDENCE_GOOD: +- return UT_CONFIDENCE_GOOD; + case WPD_CONFIDENCE_EXCELLENT: + return UT_CONFIDENCE_PERFECT; + default: +@@ -328,7 +312,7 @@ + UT_Error IE_Imp_WordPerfect::_loadFile(GsfInput * input) + { + AbiWordperfectInputStream gsfInput(input); +- WPDResult error = WPDocument::parse(&gsfInput, static_cast(this)); ++ WPDResult error = WPDocument::parse(&gsfInput, static_cast(this), NULL); + + if (error != WPD_OK) + { +@@ -381,9 +365,9 @@ + float marginLeft = 1.0f, marginRight = 1.0f; + + if (propList["fo:margin-left"]) +- marginLeft = propList["fo:margin-left"]->getFloat(); ++ marginLeft = propList["fo:margin-left"]->getDouble(); + if (propList["fo:margin-right"]) +- marginRight = propList["fo:margin-right"]->getFloat(); ++ marginRight = propList["fo:margin-right"]->getDouble(); + + if (marginLeft != m_leftPageMargin || marginRight != m_rightPageMargin /* || */ + /* marginTop != m_marginBottom || marginBottom != m_marginBottom */ ) +@@ -456,15 +440,15 @@ + float marginTop = 0.0f, marginBottom = 0.0f; + float marginLeft = 0.0f, marginRight = 0.0f, textIndent = 0.0f; + if (propList["fo:margin-top"]) +- marginTop = propList["fo:margin-top"]->getFloat(); ++ marginTop = propList["fo:margin-top"]->getDouble(); + if (propList["fo:margin-bottom"]) +- marginBottom = propList["fo:margin-bottom"]->getFloat(); ++ marginBottom = propList["fo:margin-bottom"]->getDouble(); + if (propList["fo:margin-left"]) +- marginLeft = propList["fo:margin-left"]->getFloat(); ++ marginLeft = propList["fo:margin-left"]->getDouble(); + if (propList["fo:margin-right"]) +- marginRight = propList["fo:margin-right"]->getFloat(); ++ marginRight = propList["fo:margin-right"]->getDouble(); + if (propList["fo:text-indent"]) +- textIndent = propList["fo:text-indent"]->getFloat(); ++ textIndent = propList["fo:text-indent"]->getDouble(); + + m_topMargin = marginTop; + m_bottomMargin = marginBottom; +@@ -487,7 +471,7 @@ + + float lineSpacing = 1.0f; + if (propList["fo:line-height"]) +- lineSpacing = propList["fo:line-height"]->getFloat(); ++ lineSpacing = propList["fo:line-height"]->getDouble(); + + UT_String tmpBuffer; + UT_String_sprintf(tmpBuffer, "; margin-top:%.4fin; margin-bottom:%.4fin; margin-left:%.4fin; margin-right:%.4fin; text-indent:%.4fin; line-height:%.4f", +@@ -504,7 +488,7 @@ + propBuffer += tmpBuffer; + if (i()["style:position"]) + { +- UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getFloat()); ++ UT_String_sprintf(tmpBuffer, "%.4fin", i()["style:position"]->getDouble()); + propBuffer += tmpBuffer; + } + +@@ -640,9 +624,9 @@ + + // TODO: support spaceAfter + if (propList["fo:margin-left"]) +- marginLeft = propList["fo:margin-left"]->getFloat(); ++ marginLeft = propList["fo:margin-left"]->getDouble(); + if (propList["fo:margin-right"]) +- marginRight = propList["fo:margin-right"]->getFloat(); ++ marginRight = propList["fo:margin-right"]->getDouble(); + + if (marginLeft != m_leftSectionMargin || marginRight != m_rightSectionMargin || m_sectionColumnsCount != columnsCount) + m_bSectionChanged = true; +@@ -709,9 +693,9 @@ + if (propList["style:num-format"]) + listType = propList["style:num-format"]->getStr().cstr()[0]; + if (propList["text:space-before"]) +- listLeftOffset = propList["text:space-before"]->getFloat(); ++ listLeftOffset = propList["text:space-before"]->getDouble(); + if (propList["text:min-label-width"]) +- listMinLabelWidth = propList["text:min-label-width"]->getFloat(); ++ listMinLabelWidth = propList["text:min-label-width"]->getDouble(); + + if (!m_pCurrentListDefinition || + m_pCurrentListDefinition->getOutlineHash() != listID || +@@ -749,9 +733,9 @@ + if (propList["libwpd:level"]) + level = propList["libwpd:level"]->getInt(); + if (propList["text:space-before"]) +- listLeftOffset = propList["text:space-before"]->getFloat(); ++ listLeftOffset = propList["text:space-before"]->getDouble(); + if (propList["text:min-label-width"]) +- listMinLabelWidth = propList["text:min-label-width"]->getFloat(); ++ listMinLabelWidth = propList["text:min-label-width"]->getDouble(); + + if (!m_pCurrentListDefinition || m_pCurrentListDefinition->getOutlineHash() != listID) + { +@@ -871,10 +855,10 @@ + + UT_String_sprintf(tempBuffer, "margin-left:%.4fin; ", m_pCurrentListDefinition->getListLeftOffset(m_iCurrentListLevel) + + m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel) +- - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f)); ++ - (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f)); + propBuffer += tempBuffer; + UT_String_sprintf(tempBuffer, "text-indent:%.4fin", - m_pCurrentListDefinition->getListMinLabelWidth(m_iCurrentListLevel) +- + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getFloat() : 0.0f)); ++ + (propList["fo:text-indent"] ? propList["fo:text-indent"]->getDouble() : 0.0f)); + propBuffer += tempBuffer; + + listAttribs[attribsCount++] = PT_PROPS_ATTRIBUTE_NAME; +@@ -1263,7 +1247,7 @@ + virtual UT_Error _loadFile(GsfInput * input) + { + AbiWordperfectInputStream gsfInput(input); +- WPSResult error = WPSDocument::parse(&gsfInput, static_cast(this)); ++ WPSResult error = WPSDocument::parse(&gsfInput, static_cast(this)); + + if (error != WPS_OK) + { +@@ -1302,18 +1286,12 @@ + { + AbiWordperfectInputStream gsfInput(input); + +- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput, true); ++ WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput); + + switch (confidence) + { + case WPS_CONFIDENCE_NONE: + return UT_CONFIDENCE_ZILCH; +- case WPS_CONFIDENCE_POOR: +- return UT_CONFIDENCE_POOR; +- case WPS_CONFIDENCE_LIKELY: +- return UT_CONFIDENCE_SOSO; +- case WPS_CONFIDENCE_GOOD: +- return UT_CONFIDENCE_GOOD; + case WPS_CONFIDENCE_EXCELLENT: + return UT_CONFIDENCE_PERFECT; + default: +diff -Nur abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h +--- abiword-2.8.6.orig//plugins/wordperfect/xp/ie_imp_WordPerfect.h 2009-06-19 01:55:49.000000000 -0700 ++++ abiword-2.8.6/plugins/wordperfect/xp/ie_imp_WordPerfect.h 2010-12-06 13:59:53.929715254 -0800 +@@ -30,13 +30,7 @@ + #define IE_IMP_WP_H + + #include +-#ifdef _WIN32 +-#define POINT WPX_POINT +-#endif + #include +-#ifdef _WIN32 +-#undef POINT +-#endif + #include "ie_imp.h" + #include "ut_string.h" + #include "ut_string_class.h" +@@ -98,7 +92,7 @@ + IE_Imp ** ppie); + }; + +-class IE_Imp_WordPerfect : public IE_Imp, public WPXHLListenerImpl ++class IE_Imp_WordPerfect : public IE_Imp, public WPXDocumentInterface + { + public: + IE_Imp_WordPerfect(PD_Document * pDocument); +@@ -154,6 +148,21 @@ + virtual void insertCoveredTableCell(const WPXPropertyList & /*propList*/) {} + virtual void closeTable(); + ++ virtual void definePageStyle(const WPXPropertyList&) {} ++ virtual void defineParagraphStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} ++ virtual void defineCharacterStyle(const WPXPropertyList&) {} ++ virtual void defineSectionStyle(const WPXPropertyList&, const WPXPropertyListVector&) {} ++ virtual void insertSpace() {} ++ virtual void insertField(const WPXString&, const WPXPropertyList&) {} ++ virtual void openComment(const WPXPropertyList&) {} ++ virtual void closeComment() {} ++ virtual void openTextBox(const WPXPropertyList&) {} ++ virtual void closeTextBox() {} ++ virtual void openFrame(const WPXPropertyList&) {} ++ virtual void closeFrame() {} ++ virtual void insertBinaryObject(const WPXPropertyList&, const WPXBinaryData&) {} ++ virtual void insertEquation(const WPXPropertyList&, const WPXString&) {} ++ + + protected: + virtual UT_Error _loadFile(GsfInput * input); +diff -Nur abiword-2.8.6.orig//plugins/wpg/plugin.m4 abiword-2.8.6/plugins/wpg/plugin.m4 +--- abiword-2.8.6.orig//plugins/wpg/plugin.m4 2010-05-30 07:50:46.000000000 -0700 ++++ abiword-2.8.6/plugins/wpg/plugin.m4 2010-12-06 13:59:53.929715254 -0800 +@@ -1,5 +1,5 @@ + +-wpg_pkgs="$gsf_req libwpg-0.1 >= 0.1.0 libwpd-0.8 >= 0.8.0" ++wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0" + wpg_deps="no" + + if test "$enable_wpg" != ""; then +diff -Nur abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp +--- abiword-2.8.6.orig//plugins/wpg/xp/ie_impGraphic_WPG.cpp 2008-08-15 14:52:32.000000000 -0700 ++++ abiword-2.8.6/plugins/wpg/xp/ie_impGraphic_WPG.cpp 2010-12-06 13:59:53.923048588 -0800 +@@ -31,11 +31,10 @@ + #include + #include + #include +-#include ++#include + #include "xap_Module.h" + + using libwpg::WPGraphics; +-using libwpg::WPGString; + + ABI_PLUGIN_DECLARE("WPG") + +@@ -48,7 +47,7 @@ + virtual bool isOLEStream(); + virtual WPXInputStream * getDocumentOLEStream(); + virtual WPXInputStream * getDocumentOLEStream(const char * name); +- virtual const uint8_t *read(size_t numBytes, size_t &numBytesRead); ++ virtual const unsigned char *read(unsigned long numBytes, unsigned long &numBytesRead); + virtual int seek(long offset, WPX_SEEK_TYPE seekType); + virtual long tell(); + virtual bool atEOS(); +@@ -60,7 +59,7 @@ + }; + + AbiWordPerfectGraphicsInputStream::AbiWordPerfectGraphicsInputStream(GsfInput *input) : +- WPXInputStream(true), ++ WPXInputStream(), + m_input(input), + m_ole(NULL) + { +@@ -75,9 +74,9 @@ + g_object_unref(G_OBJECT(m_input)); + } + +-const uint8_t * AbiWordPerfectGraphicsInputStream::read(size_t numBytes, size_t &numBytesRead) ++const unsigned char * AbiWordPerfectGraphicsInputStream::read(unsigned long numBytes, unsigned long &numBytesRead) + { +- const uint8_t *buf = gsf_input_read(m_input, numBytes, NULL); ++ const unsigned char *buf = gsf_input_read(m_input, numBytes, NULL); + + if (buf == NULL) + numBytesRead = 0; +@@ -245,10 +244,10 @@ + UT_Error IE_Imp_WordPerfectGraphics::importGraphic(GsfInput *input, FG_Graphic **ppfg) + { + AbiWordPerfectGraphicsInputStream gsfInput(input); +- WPGString svgOutput; ++ WPXString svgOutput; + if (WPGraphics::generateSVG(&gsfInput, svgOutput)) + { +- GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.length(), false); ++ GsfInput * svgInput = gsf_input_memory_new((const guint8*)svgOutput.cstr(), svgOutput.len(), false); + UT_Error result = IE_ImpGraphic::loadGraphic(svgInput, IE_ImpGraphic::fileTypeForSuffix(".svg"), ppfg); + g_object_unref(svgInput); + return result; diff --git a/libre/abiword-libre/liberation-fonts.patch b/libre/abiword-libre/liberation-fonts.patch new file mode 100644 index 000000000..a009b18f5 --- /dev/null +++ b/libre/abiword-libre/liberation-fonts.patch @@ -0,0 +1,1606 @@ +diff -auNpr abiword-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp abiword-libre-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp +--- abiword-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp 2009-07-20 16:22:04.000000000 -0300 ++++ abiword-libre-2.8.6/plugins/latex/xp/ie_exp_LaTeX.cpp 2011-07-02 15:37:16.397564815 -0300 +@@ -1062,7 +1062,7 @@ void s_LaTeX_Listener::_openSpan(PT_Attr + m_pie->write("\\texttt{"); + m_NumCloseBrackets++; + } +- if (!strcmp("Arial", szValue) || ++ if (!strcmp("Liberation Sans", szValue) || + !strcmp("Helvetic", szValue) || + !strcmp("Luxi Sans",szValue)) { + m_pie->write("\\textsf{"); +diff -auNpr abiword-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp abiword-libre-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp +--- abiword-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp 2008-04-20 11:44:51.000000000 -0300 ++++ abiword-libre-2.8.6/plugins/opendocument/imp/xp/ODi_FontFaceDecls.cpp 2011-07-02 15:37:12.791762814 -0300 +@@ -59,7 +59,7 @@ void ODi_FontFaceDecls::startElement (co + fontFamily = pFontFamily; + + if (pFontFamily && (pFontFamily[0] == '\'') && (pFontFamily[strlen(pFontFamily)-1] == '\'')) { +- // e.g.: Turns a "'Times New Roman'" into a "Times New Roman". ++ // e.g.: Turns a "'Liberation Serif'" into a "Liberation Serif". + // OpenOffice.org sometimes adds those extra "'" surrounding the + // font family name if it's composed by more than one word. + m_fontFamilies[pStyleName] = +diff -auNpr abiword-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp abiword-libre-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp +--- abiword-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp 2009-06-25 18:29:32.000000000 -0300 ++++ abiword-libre-2.8.6/plugins/openwriter/xp/ie_exp_OpenWriter.cpp 2011-07-02 15:37:16.561646815 -0300 +@@ -899,12 +899,12 @@ bool OO_StylesWriter::writeStyles(PD_Doc + { + "\n", + "\n", +- "\n", ++ "\n", + "\n", + "\n", + "\n", + "\n", +- "\n", ++ "\n", + "\n" + }; + +diff -auNpr abiword-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp +--- abiword-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp 2008-01-16 15:02:48.000000000 -0200 ++++ abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_FontManager.cpp 2011-07-02 15:37:13.944338815 -0300 +@@ -34,7 +34,7 @@ + #include + + OXML_FontManager::OXML_FontManager() : +- m_defaultFont("Times New Roman") ++ m_defaultFont("Liberation Serif") + { + m_major_rts.clear(); + m_minor_rts.clear(); +diff -auNpr abiword-2.8.6/plugins/openxml/common/xp/OXML_List.cpp abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_List.cpp +--- abiword-2.8.6/plugins/openxml/common/xp/OXML_List.cpp 2009-07-02 12:20:55.000000000 -0300 ++++ abiword-libre-2.8.6/plugins/openxml/common/xp/OXML_List.cpp 2011-07-02 15:37:13.960346815 -0300 +@@ -258,7 +258,7 @@ UT_Error OXML_List::serialize(IE_Exp_Ope + txt = txt.replace(index+1, 1, 1, '1'+i); + } + +- std::string fontFamily("Times New Roman"); ++ std::string fontFamily("Liberation Serif"); + const gchar* listType = "bullet"; + switch(type) + { +diff -auNpr abiword-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp abiword-libre-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp +--- abiword-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp 2009-05-07 18:45:16.000000000 -0300 ++++ abiword-libre-2.8.6/plugins/passepartout/xp/ie_exp_Passepartout.cpp 2011-07-02 15:37:14.172452815 -0300 +@@ -318,7 +318,7 @@ void Passepartout_Listener::_openBlock(P + } + else + { +- TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Times New Roman" ); ++ TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Liberation Serif" ); + m_pie->write(TempStr.utf8_str()); + } + +@@ -426,7 +426,7 @@ void Passepartout_Listener::_openFont(PT + } + else + { +- TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Times New Roman" ); ++ TempStr = UT_UTF8String_sprintf(" font-family=\"%s\"", "Liberation Serif" ); + m_pie->write(TempStr.utf8_str()); + } + +diff -auNpr abiword-2.8.6/plugins/t602/xp/ie_imp_T602.cpp abiword-libre-2.8.6/plugins/t602/xp/ie_imp_T602.cpp +--- abiword-2.8.6/plugins/t602/xp/ie_imp_T602.cpp 2009-01-04 18:34:28.000000000 -0200 ++++ abiword-libre-2.8.6/plugins/t602/xp/ie_imp_T602.cpp 2011-07-02 15:37:14.676704815 -0300 +@@ -620,7 +620,7 @@ switch (c) + case 0x01: + m_sfont ^=1; + if (m_sfont & 1) +- { m_size=static_cast(0.8*m_basesize); m_family="Arial"; ++ { m_size=static_cast(0.8*m_basesize); m_family="Liberation Sans"; + /* FIXME? -> .profile?*/ } + else + { m_size=m_basesize; m_family=m_basefamily; } +diff -auNpr abiword-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp abiword-libre-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp +--- abiword-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp 2009-09-04 09:40:10.000000000 -0300 ++++ abiword-libre-2.8.6/src/af/gr/gtk/gr_UnixCairoGraphics.cpp 2011-07-02 15:36:53.578160816 -0300 +@@ -182,7 +182,7 @@ GR_Font * GR_UnixCairoGraphics::getGUIFo + GtkStyle *tempStyle = gtk_style_new(); + const char *guiFontName = pango_font_description_get_family(tempStyle->font_desc); + if (!guiFontName) +- guiFontName = "'Times New Roman'"; ++ guiFontName = "'Liberation Serif'"; + + UT_UTF8String s = XAP_EncodingManager::get_instance()->getLanguageISOName(); + +diff -auNpr abiword-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp abiword-libre-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp +--- abiword-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp 2010-04-14 18:13:41.000000000 -0300 ++++ abiword-libre-2.8.6/src/af/gr/xp/gr_CairoGraphics.cpp 2011-07-02 15:36:53.918330816 -0300 +@@ -756,8 +756,8 @@ bool GR_CairoGraphics::shape(GR_ShapingI + + /* + * Pango does a royally bad job of the font substitution in +- * pango_itemize(): it will happily return 'Times New Roman' as +- * font when we have requested 'Arial', even though the latter is ++ * pango_itemize(): it will happily return 'Liberation Serif' as ++ * font when we have requested 'Liberation Sans', even though the latter is + * present and has the necessary coverage. Consequently we have to + * do the font substitution manually even on the first shapping. + * +@@ -2931,7 +2931,7 @@ GR_Font * GR_CairoGraphics::getDefaultFo + + case GR_Font::FF_Technical: + case GR_Font::FF_BiDi: +- pszFontFamily = "Arial"; ++ pszFontFamily = "Liberation Sans"; + break; + + default: +diff -auNpr abiword-2.8.6/src/af/util/xp/ut_misc.cpp abiword-libre-2.8.6/src/af/util/xp/ut_misc.cpp +--- abiword-2.8.6/src/af/util/xp/ut_misc.cpp 2009-06-28 19:09:08.000000000 -0300 ++++ abiword-libre-2.8.6/src/af/util/xp/ut_misc.cpp 2011-07-02 15:36:54.746744816 -0300 +@@ -606,7 +606,7 @@ const gchar ** UT_setPropsToValue(const + } + + /*! +- splits the xml property string (font-size:24pt;font-face:Arial') into names and values ++ splits the xml property string (font-size:24pt;font-face:Liberation Sans') into names and values + and stores them in an array + + the caller has to delete[] the array; the process is destructive to props +diff -auNpr abiword-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib abiword-libre-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib +--- abiword-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib 2005-08-02 02:31:06.000000000 -0300 ++++ abiword-libre-2.8.6/src/af/xap/cocoa/xap_CocoaToolPalette.nib/keyedobjects.nib 2011-07-02 15:36:51.257000816 -0300 +@@ -10910,7 +10910,7 @@ + 624 + + +- Times New Roman ++ Liberation Serif + _popUpItemAction: + + $class +diff -auNpr abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp abiword-libre-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp +--- abiword-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp 2009-09-01 11:49:33.000000000 -0300 ++++ abiword-libre-2.8.6/src/af/xap/gtk/xap_UnixDlg_FileOpenSaveAs.cpp 2011-07-02 15:36:50.404574816 -0300 +@@ -878,7 +878,7 @@ gint XAP_UnixDialog_FileOpenSaveAs::prev + + const gchar * file_name = gtk_file_chooser_get_uri (m_FC); + +- GR_Font * fnt = pGr->findFont("Times New Roman", ++ GR_Font * fnt = pGr->findFont("Liberation Serif", + "normal", "", "normal", + "", "12pt", + pSS->getLanguageName()); +diff -auNpr abiword-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp abiword-libre-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp +--- abiword-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp 2009-07-08 05:17:51.000000000 -0300 ++++ abiword-libre-2.8.6/src/af/xap/win/xap_Win32Dlg_About.cpp 2011-07-02 15:36:50.788766816 -0300 +@@ -258,7 +258,7 @@ void XAP_Win32Dialog_About::runModal(XAP + lf.lfWeight = 0; + HFONT hfontSmall = CreateFontIndirect(&lf); + +- strcpy(lf.lfFaceName, "Arial"); ++ strcpy(lf.lfFaceName, "Liberation Sans"); + lf.lfHeight = 36; + lf.lfWeight = FW_BOLD; + HFONT hfontHeading = CreateFontIndirect(&lf); +diff -auNpr abiword-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp +--- abiword-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp 2009-05-30 11:03:24.000000000 -0300 ++++ abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_FontChooser.cpp 2011-07-02 15:36:52.893818816 -0300 +@@ -569,7 +569,7 @@ void XAP_Preview_FontPreview::draw(void) + std::string sWeight = getVal("font-weight"); + + if(sFamily.empty()) +- sFamily = "Times New Roman"; ++ sFamily = "Liberation Serif"; + + if(sStyle.empty()) + sStyle = "normal"; +diff -auNpr abiword-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp +--- abiword-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp 2007-01-16 20:17:27.000000000 -0300 ++++ abiword-libre-2.8.6/src/af/xap/xp/xap_Dlg_Zoom.cpp 2011-07-02 15:36:52.681712816 -0300 +@@ -124,7 +124,7 @@ void XAP_Dialog_Zoom::_createPreviewFrom + UT_ASSERT(m_zoomPreview); + + m_zoomPreview->setWindowSize(width, height); +- m_zoomPreview->setString("10-pt Times New Roman"); ++ m_zoomPreview->setString("10-pt Liberation Serif"); + m_zoomPreview->setFont(XAP_Preview_Zoom::font_NORMAL); + m_zoomPreview->setZoomPercent(m_zoomPercent); + +diff -auNpr abiword-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp abiword-libre-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp +--- abiword-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp 2009-10-29 14:47:05.000000000 -0300 ++++ abiword-libre-2.8.6/src/af/xap/xp/xap_Preview_Zoom.cpp 2011-07-02 15:36:52.753748816 -0300 +@@ -63,7 +63,7 @@ void XAP_Preview_Zoom::setFont(XAP_Previ + { + case XAP_Preview_Zoom::font_NORMAL: + sprintf (fontString, "%dpt", (10 * m_zoomPercent / 100)); +- found = m_gc->findFont("Times New Roman", ++ found = m_gc->findFont("Liberation Serif", + "normal", "", "normal", + "", fontString, + NULL); +diff -auNpr abiword-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp abiword-libre-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp +--- abiword-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp 2010-06-13 11:02:39.000000000 -0300 ++++ abiword-libre-2.8.6/src/text/fmt/xp/fl_BlockLayout.cpp 2011-07-02 15:37:06.980858815 -0300 +@@ -9733,7 +9733,7 @@ void fl_BlockLayout::StartList( const gc + { + FL_ListType lType = getListTypeFromStyle(szListStyle); + if(IS_NUMBERED_LIST_TYPE(lType)) +- szFont = "Times New Roman"; ++ szFont = "Liberation Serif"; + else + szFont = "symbol"; + UT_ASSERT(0); +diff -auNpr abiword-2.8.6/src/text/fmt/xp/fp_Line.cpp abiword-libre-2.8.6/src/text/fmt/xp/fp_Line.cpp +--- abiword-2.8.6/src/text/fmt/xp/fp_Line.cpp 2009-09-09 03:20:32.000000000 -0300 ++++ abiword-libre-2.8.6/src/text/fmt/xp/fp_Line.cpp 2011-07-02 15:37:07.265000815 -0300 +@@ -1273,7 +1273,7 @@ void fp_Line::_doClearScreenFromRunToEnd + pRun = m_vecRuns.getNthItem(_getRunLogIndx(runIndex)); + + // Handle case where character extends behind the left side +- // like italic Times New Roman f. Clear a litle bit before if ++ // like italic Liberation Serif f. Clear a litle bit before if + // there is clear screen there + UT_sint32 j = runIndex - 1; + +diff -auNpr abiword-2.8.6/src/text/fmt/xp/fp_TextRun.cpp abiword-libre-2.8.6/src/text/fmt/xp/fp_TextRun.cpp +--- abiword-2.8.6/src/text/fmt/xp/fp_TextRun.cpp 2010-04-14 18:49:37.000000000 -0300 ++++ abiword-libre-2.8.6/src/text/fmt/xp/fp_TextRun.cpp 2011-07-02 15:37:08.021378815 -0300 +@@ -1434,7 +1434,7 @@ void fp_TextRun::_clearScreen(bool /* bF + + // + // Handle case where character extend behind the left side +- // like italic Times New Roman f ++ // like italic Liberation Serif f + // + fp_Line * thisLine = getLine(); + fp_Run * pPrev = getPrevRun(); +diff -auNpr abiword-2.8.6/src/text/fmt/xp/fv_View.cpp abiword-libre-2.8.6/src/text/fmt/xp/fv_View.cpp +--- abiword-2.8.6/src/text/fmt/xp/fv_View.cpp 2010-06-13 11:02:39.000000000 -0300 ++++ abiword-libre-2.8.6/src/text/fmt/xp/fv_View.cpp 2011-07-02 15:37:08.353544815 -0300 +@@ -519,9 +519,9 @@ FV_View::FV_View(XAP_App * pApp, void* p + s += pCountry; + } + +- // do a fuzzy match for Times New Roman ++ // do a fuzzy match for Liberation Serif + const char * pszFamily = +- GR_Graphics::findNearestFont ("Times New Roman", ++ GR_Graphics::findNearestFont ("Liberation Serif", + "normal", "normal", + "normal", "normal", + "12pt", s.utf8_str()); +diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pp_Property.cpp abiword-libre-2.8.6/src/text/ptbl/xp/pp_Property.cpp +--- abiword-2.8.6/src/text/ptbl/xp/pp_Property.cpp 2009-05-18 23:33:18.000000000 -0300 ++++ abiword-libre-2.8.6/src/text/ptbl/xp/pp_Property.cpp 2011-07-02 15:37:09.053894814 -0300 +@@ -99,7 +99,7 @@ static PP_Property _props[] = + + { "field-color", "dcdcdc", true, NULL, PP_LEVEL_FIELD}, + { "field-font", "NULL", true, NULL, PP_LEVEL_FIELD}, +- { "font-family", "Times New Roman", true, NULL, PP_LEVEL_CHAR}, ++ { "font-family", "Liberation Serif", true, NULL, PP_LEVEL_CHAR}, + { "font-size", "12pt", true, NULL, PP_LEVEL_CHAR}, // MS word defaults to 10pt, but it just seems too small + { "font-stretch", "normal", true, NULL, PP_LEVEL_CHAR}, + { "font-style", "normal", true, NULL, PP_LEVEL_CHAR}, +diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pp_Revision.cpp abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.cpp +--- abiword-2.8.6/src/text/ptbl/xp/pp_Revision.cpp 2009-05-07 23:35:14.000000000 -0300 ++++ abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.cpp 2011-07-02 15:37:08.881808814 -0300 +@@ -350,7 +350,7 @@ void PP_RevisionAttr::_init(const gchar + return; + + // the string we are parsing looks like +- // "+1,-2,!3{font-family: Times New Roman}" ++ // "+1,-2,!3{font-family: Liberation Serif}" + + // first duplicate the string so we can play with it ... + char * s = (char*) g_strdup(r); +diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pp_Revision.h abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.h +--- abiword-2.8.6/src/text/ptbl/xp/pp_Revision.h 2009-01-04 20:32:46.000000000 -0200 ++++ abiword-libre-2.8.6/src/text/ptbl/xp/pp_Revision.h 2011-07-02 15:37:09.530132814 -0300 +@@ -101,7 +101,7 @@ class ABI_EXPORT PP_Revision: public PP_ + where n is a numerical id of the revision and props is regular + property string, for instance + +- font-family:Times New Roman ++ font-family:Liberation Serif + + revoval of property/attribute is indicated by setting to -/-, e.g., + +diff -auNpr abiword-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp abiword-libre-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp +--- abiword-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp 2009-01-04 18:34:28.000000000 -0200 ++++ abiword-libre-2.8.6/src/text/ptbl/xp/pt_PT_Styles.cpp 2011-07-02 15:37:09.101918814 -0300 +@@ -155,7 +155,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v + s += pCountry; + } + +- const char* pszFamily = XAP_App::findNearestFont("Times New Roman", ++ const char* pszFamily = XAP_App::findNearestFont("Liberation Serif", + "normal", "", + "normal", "", "12pt", + s.utf8_str()); +@@ -167,7 +167,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v + "text-indent:0in; text-position:normal; line-height:1.0; " + "color:000000; bgcolor:transparent; widows:2", pszFamily); + +- pszFamily = XAP_App::findNearestFont("Arial", "normal", "", ++ pszFamily = XAP_App::findNearestFont("Liberation Sans", "normal", "", + "normal", "", "12pt", s.utf8_str()); + + // used to set the dom-dir of the style here, but we do not want to do that. The +@@ -239,7 +239,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v + UT_String_sprintf(stTmp, list_fmt, "Heart List","0", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "Dingbats", "NULL"); + _s("Heart List",false, "P", "", "Current Settings", stTmp.c_str()); + +- // pszFamily is the nearest font to Arial found in the system ++ // pszFamily is the nearest font to Liberation Sans found in the system + UT_String_sprintf(stTmp, "tabstops:0.3in/L0; list-style:Numbered List; " + "start-value:1; margin-left:0.0in; text-indent:0.0in; " + "field-color:transparent; list-delim:%%L.; field-font:%s; " +@@ -250,7 +250,7 @@ bool pt_PieceTable::_loadBuiltinStyles(v + _s("Numbered Heading 2",true,"P","Heading 2","Normal", stTmp.c_str()); + _s("Numbered Heading 3",true,"P","Heading 3","Normal", stTmp.c_str()); + +- // pszFamily is the nearest font to Arial found in the system ++ // pszFamily is the nearest font to Liberation Sans found in the system + + UT_String_sprintf(stTmp, list_fmt, "Numbered List", "1",LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L.", "NULL", "."); + +diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp +--- abiword-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp 2009-05-20 18:22:35.000000000 -0300 ++++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_Lists.cpp 2011-07-02 15:37:01.798268815 -0300 +@@ -1170,7 +1170,7 @@ void AP_Lists_preview::setData(const gch + // + if(!pszFont || strcmp(pszFont,"NULL")== 0) + { +- m_pFont = m_gc->findFont("Times New Roman", ++ m_pFont = m_gc->findFont("Liberation Serif", + "normal", "", "normal", + "", "16pt", NULL); + } +diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp +--- abiword-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp 2007-05-08 14:16:33.000000000 -0300 ++++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Dialog_PageNumbers.cpp 2011-07-02 15:37:02.462600815 -0300 +@@ -88,7 +88,7 @@ AP_Preview_PageNumbers::AP_Preview_PageN + char fontString [10]; + sprintf(fontString, "%dpt", 8); + +- GR_Font * found = m_gc->findFont("Times New Roman", "normal", ++ GR_Font * found = m_gc->findFont("Liberation Serif", "normal", + "", "normal", "", fontString, + NULL); + +diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp +--- abiword-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp 2009-09-29 10:58:11.000000000 -0300 ++++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Annotation.cpp 2011-07-02 15:37:03.311024815 -0300 +@@ -94,7 +94,7 @@ void AP_Preview_Annotation::setSizeFromA + pG = pView->getGraphics(); + + UT_return_if_fail(pG); +- GR_Font * pFont = pG->findFont("Times New Roman", "normal", ++ GR_Font * pFont = pG->findFont("Liberation Serif", "normal", + "normal", "normal", + "normal", "12pt", + NULL); +@@ -122,7 +122,7 @@ void AP_Preview_Annotation::draw(void) + UT_RGBColor FGcolor(0,0,0); + UT_RGBColor BGcolor(m_clrBackground); + +- m_pFont = m_gc->findFont("Times New Roman", "normal", ++ m_pFont = m_gc->findFont("Liberation Serif", "normal", + "normal", "normal", + "normal", "12pt", + NULL); +diff -auNpr abiword-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp +--- abiword-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp 2009-03-09 17:01:46.000000000 -0200 ++++ abiword-libre-2.8.6/src/wp/ap/xp/ap_Preview_Paragraph.cpp 2011-07-02 15:37:03.527132815 -0300 +@@ -539,7 +539,7 @@ void AP_Preview_Paragraph::draw(void) + bool AP_Preview_Paragraph::_loadDrawFont(void) + { + // we draw at 7 points in this preview +- GR_Font * font = m_gc->findFont("Times New Roman", ++ GR_Font * font = m_gc->findFont("Liberation Serif", + "normal", "", "normal", + "", "7pt", + NULL); // might need to get the real lang +diff -auNpr abiword-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp abiword-libre-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp +--- abiword-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp 2009-09-29 17:00:48.000000000 -0300 ++++ abiword-libre-2.8.6/src/wp/impexp/xp/ie_exp_RTF.cpp 2011-07-02 15:37:03.939338815 -0300 +@@ -2829,7 +2829,7 @@ void IE_Exp_RTF::_output_ListRTF(fl_Auto + case DASHED_LIST: + Param = 23; + bulletsym = '-'; +- fontName = "Times New Roman"; ++ fontName = "Liberation Serif"; + break; + case SQUARE_LIST: + Param = 23; +diff -auNpr abiword-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp +--- abiword-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp 2009-09-23 02:22:43.000000000 -0300 ++++ abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_MsWord_97.cpp 2011-07-02 15:37:03.883310815 -0300 +@@ -621,10 +621,10 @@ s_fieldFontForListStyle (MSWordListIdTyp + return "NULL"; + + case WLNF_UPPER_LETTER: // upper letter +- return "Times New Roman"; ++ return "Liberation Serif"; + + case WLNF_LOWER_LETTER: // lower letter +- return "Times New Roman"; ++ return "Liberation Serif"; + + case WLNF_BULLETS: // bullet list + UT_DEBUGMSG(("Fieldfont set to symbol \n")); +@@ -632,11 +632,11 @@ s_fieldFontForListStyle (MSWordListIdTyp + + case WLNF_EUROPEAN_ARABIC: + case WLNF_ORDINAL: // ordinal +- return "Times New Roman"; ++ return "Liberation Serif"; + + default: +- UT_DEBUGMSG(("unknown list type %d field-font set to Times New Roman \n",id)); +- return "Times New Roman"; ++ UT_DEBUGMSG(("unknown list type %d field-font set to Liberation Serif \n",id)); ++ return "Liberation Serif"; + } + } + +@@ -5243,7 +5243,7 @@ void IE_Imp_MsWord_97::_generateCharProp + if(fname) + s += fname; + else +- s += "Times New Roman"; ++ s += "Liberation Serif"; + FREEP(fname); + } + +diff -auNpr abiword-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp +--- abiword-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp 2009-07-27 02:26:14.000000000 -0300 ++++ abiword-libre-2.8.6/src/wp/impexp/xp/ie_imp_RTF.cpp 2011-07-02 15:37:04.239488815 -0300 +@@ -5958,11 +5958,11 @@ bool IE_Imp_RTF::buildCharacterProps(UT_ + // {\f83\fnil\fcharset0\fprq0{\*\panose 00000000000000000000} ;} + // note the empty slot after the panose entry + // later it gets referenced: {\b\f83\fs24\cf1\cgrid0 Malte Cornils +- // this turns those into "Times New Roman" for now, as a hack to keep from crashing ++ // this turns those into "Liberation Serif" for now, as a hack to keep from crashing + if ( pFont->m_pFontName != NULL ) + propBuffer += pFont->m_pFontName; + else +- propBuffer += "Times New Roman"; ++ propBuffer += "Liberation Serif"; + } + if (m_currentRTFState.m_charProps.m_hasColour) + { +@@ -8612,7 +8612,7 @@ bool IE_Imp_RTF::ReadFontTable() + { + // NB: Ignores whitespace until we've seen non-whitespace data. + // This means we pick up the spaces in font names like +- // "Times New Roman", but it also means that any font names ++ // "Liberation Serif", but it also means that any font names + // that genuinely start with spaces will have them discarded. + // This is hopefully not a problem. + tokenType = NextToken(keyword, ¶meter,& paramUsed, +@@ -8680,11 +8680,11 @@ bool IE_Imp_RTF::ReadFontTable() + // It's possible that the font name will be empty. This might happend + // because the font table didn't specify a name, or because the \ansicpgN + // command was invalid, in which case the mbtowc convertion might fail. +- // In these cases, substitute "Times New Roman". ++ // In these cases, substitute "Liberation Serif". + if (!sFontNamesAndPanose[SFontTableState::MainFontName].length()) + { +- UT_DEBUGMSG(("RTF: Font Index %d: Substituting \"Times New Roman\" for missing font name.\n", fontIndex)); +- sFontNamesAndPanose[SFontTableState::MainFontName] = "Times New Roman"; ++ UT_DEBUGMSG(("RTF: Font Index %d: Substituting \"Liberation Serif\" for missing font name.\n", fontIndex)); ++ sFontNamesAndPanose[SFontTableState::MainFontName] = "Liberation Serif"; + } + // Validate and post-process the Panose string. + if (!PostProcessAndValidatePanose(sFontNamesAndPanose[SFontTableState::Panose])) +diff -auNpr abiword-2.8.6/user/wp/readme.abw abiword-libre-2.8.6/user/wp/readme.abw +--- abiword-2.8.6/user/wp/readme.abw 2009-07-23 16:50:13.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/readme.abw 2011-07-02 15:37:19.891310814 -0300 +@@ -16,9 +16,9 @@ + + + +- +- +- ++ ++ ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/Business-Letter.awt abiword-libre-2.8.6/user/wp/templates/Business-Letter.awt +--- abiword-2.8.6/user/wp/templates/Business-Letter.awt 2009-05-22 07:15:16.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/Business-Letter.awt 2011-07-02 15:37:19.995362813 -0300 +@@ -19,14 +19,14 @@ + + + +- +- +- ++ ++ ++ + +- +- +- +- ++ ++ ++ ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/Business-Report.awt abiword-libre-2.8.6/user/wp/templates/Business-Report.awt +--- abiword-2.8.6/user/wp/templates/Business-Report.awt 2009-05-22 07:15:18.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/Business-Report.awt 2011-07-02 15:37:20.011370813 -0300 +@@ -21,7 +21,7 @@ +

+

+

Title

+-

Subtitle

++

Subtitle

+

+

Release 1.0

+

+@@ -99,11 +99,11 @@ +
+

+

+-

Heading 1

++

Heading 1

+

text

+-

Heading 2

++

Heading 2

+

text

+-

Heading 3

++

Heading 3

+

+
+
+diff -auNpr abiword-2.8.6/user/wp/templates/Employee-Directory.awt abiword-libre-2.8.6/user/wp/templates/Employee-Directory.awt +--- abiword-2.8.6/user/wp/templates/Employee-Directory.awt 2009-05-22 07:15:21.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/Employee-Directory.awt 2011-07-02 15:37:20.047388813 -0300 +@@ -10,9 +10,9 @@ + + +
+-

Company Name

+-

Directory of Employees

+-

++

Company Name

++

Directory of Employees

++

+

+

+

+@@ -36,59 +36,59 @@ +

Normal Style (123) 555-1212

+

+

+-

Department Name

+-

The big boss upstairs (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

+-

+-

Department Name

+-

The big boss upstairs (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

+-

+-

Department Name

+-

The big boss upstairs (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

+-

+-

Department Name

+-

The big boss upstairs (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

Last Name, First Name (123) 555-1212

+-

+-

+-

General Numbers

+-

Front Desk (123) 555-1212

+-

Security (123) 555-1212

+-

Building Management (123) 555-1212

+-

Other General Numbers (123) 555-1212

++

Department Name

++

The big boss upstairs (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

++

++

Department Name

++

The big boss upstairs (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

++

++

Department Name

++

The big boss upstairs (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

++

++

Department Name

++

The big boss upstairs (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

Last Name, First Name (123) 555-1212

++

++

++

General Numbers

++

Front Desk (123) 555-1212

++

Security (123) 555-1212

++

Building Management (123) 555-1212

++

Other General Numbers (123) 555-1212

+
+ + +diff -auNpr abiword-2.8.6/user/wp/templates/Fax-Coversheet.awt abiword-libre-2.8.6/user/wp/templates/Fax-Coversheet.awt +--- abiword-2.8.6/user/wp/templates/Fax-Coversheet.awt 2009-05-22 07:15:24.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/Fax-Coversheet.awt 2011-07-02 15:37:20.027378813 -0300 +@@ -10,26 +10,26 @@ + + +
+-

Company Name

+-

Company Address Line 1

+-

Company Address Line 2

+-

Company Address Line 3

+-

+-

FAX

+-

TO: From:

+-

Fax: Pages:

+-

Phone: Date:

++

Company Name

++

Company Address Line 1

++

Company Address Line 2

++

Company Address Line 3

++

++

FAX

++

TO: From:

++

Fax: Pages:

++

Phone: Date:

+

+

Re: CC:

+

+

+-

 Urgent  For Review  Please Comment  Please Reply  Please Recycle

+-

++

 Urgent  For Review  Please Comment  Please Reply  Please Recycle

++

+

+

+-

Comments

++

Comments

+

+-

This text should the replaced with your comments about the fax and any additional comment to the receiver.

++

This text should the replaced with your comments about the fax and any additional comment to the receiver.

+
+ + +diff -auNpr abiword-2.8.6/user/wp/templates/Friendly-Letter.awt abiword-libre-2.8.6/user/wp/templates/Friendly-Letter.awt +--- abiword-2.8.6/user/wp/templates/Friendly-Letter.awt 2009-05-22 07:15:27.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/Friendly-Letter.awt 2011-07-02 15:37:20.023376813 -0300 +@@ -16,12 +16,12 @@ + + + +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/Memo.awt abiword-libre-2.8.6/user/wp/templates/Memo.awt +--- abiword-2.8.6/user/wp/templates/Memo.awt 2009-05-22 07:15:31.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/Memo.awt 2011-07-02 15:37:19.915322814 -0300 +@@ -14,10 +14,10 @@ + Fri Mar 12 21:07:56 2004 + + +- +- +- +- ++ ++ ++ ++ + + + +@@ -59,10 +59,10 @@ +

The box that this text is in uses AbiWord's table support to draw the border. You can either allow the border to fit to the size of the text as it is now, or press <ENTER> repeatedly at the end of your memo to expand the border to fill the rest of the page.

+

Don't forget to change the header and footer before printing! If you wish to save this memo for later and ensure that the date above is saved as today's (not automatically updating), select it and type the desired date text over it.

+

The styles used in this document for correct conversion, import, export, and HTML are:

+-

Heading 1 for Company Name

+-

Heading 2 for Slogan

+-

Heading 3 for "Date:", "To:", etc.

+-

Normal for body text

++

Heading 1 for Company Name

++

Heading 2 for Slogan

++

Heading 3 for "Date:", "To:", etc.

++

Normal for body text

+ + +

+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt abiword-libre-2.8.6/user/wp/templates/normal.awt +--- abiword-2.8.6/user/wp/templates/normal.awt 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt 2011-07-02 15:37:20.019374813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + + +diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-am_ET abiword-libre-2.8.6/user/wp/templates/normal.awt-am_ET +--- abiword-2.8.6/user/wp/templates/normal.awt-am_ET 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-am_ET 2011-07-02 15:37:20.015372813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ar abiword-libre-2.8.6/user/wp/templates/normal.awt-ar +--- abiword-2.8.6/user/wp/templates/normal.awt-ar 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ar 2011-07-02 15:37:20.019374813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ar_EG abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_EG +--- abiword-2.8.6/user/wp/templates/normal.awt-ar_EG 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_EG 2011-07-02 15:37:19.979354813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ar_SA abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_SA +--- abiword-2.8.6/user/wp/templates/normal.awt-ar_SA 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ar_SA 2011-07-02 15:37:19.999364813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-bg_BG abiword-libre-2.8.6/user/wp/templates/normal.awt-bg_BG +--- abiword-2.8.6/user/wp/templates/normal.awt-bg_BG 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-bg_BG 2011-07-02 15:37:19.975352813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ca_ES abiword-libre-2.8.6/user/wp/templates/normal.awt-ca_ES +--- abiword-2.8.6/user/wp/templates/normal.awt-ca_ES 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ca_ES 2011-07-02 15:37:19.923326814 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-cs_CZ abiword-libre-2.8.6/user/wp/templates/normal.awt-cs_CZ +--- abiword-2.8.6/user/wp/templates/normal.awt-cs_CZ 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-cs_CZ 2011-07-02 15:37:20.003366813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-da_DK abiword-libre-2.8.6/user/wp/templates/normal.awt-da_DK +--- abiword-2.8.6/user/wp/templates/normal.awt-da_DK 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-da_DK 2011-07-02 15:37:19.995362813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de abiword-libre-2.8.6/user/wp/templates/normal.awt-de +--- abiword-2.8.6/user/wp/templates/normal.awt-de 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de 2011-07-02 15:37:20.007368813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de_AT abiword-libre-2.8.6/user/wp/templates/normal.awt-de_AT +--- abiword-2.8.6/user/wp/templates/normal.awt-de_AT 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de_AT 2011-07-02 15:37:19.975352813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de_CH abiword-libre-2.8.6/user/wp/templates/normal.awt-de_CH +--- abiword-2.8.6/user/wp/templates/normal.awt-de_CH 2008-04-09 21:48:42.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de_CH 2011-07-02 15:37:19.979354813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-de_DE abiword-libre-2.8.6/user/wp/templates/normal.awt-de_DE +--- abiword-2.8.6/user/wp/templates/normal.awt-de_DE 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-de_DE 2011-07-02 15:37:20.035382813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-div_MV abiword-libre-2.8.6/user/wp/templates/normal.awt-div_MV +--- abiword-2.8.6/user/wp/templates/normal.awt-div_MV 2007-01-14 12:52:46.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-div_MV 2011-07-02 15:37:20.071400813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-el_GR abiword-libre-2.8.6/user/wp/templates/normal.awt-el_GR +--- abiword-2.8.6/user/wp/templates/normal.awt-el_GR 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-el_GR 2011-07-02 15:37:20.063396813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_AU abiword-libre-2.8.6/user/wp/templates/normal.awt-en_AU +--- abiword-2.8.6/user/wp/templates/normal.awt-en_AU 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_AU 2011-07-02 15:37:19.903316814 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_CA abiword-libre-2.8.6/user/wp/templates/normal.awt-en_CA +--- abiword-2.8.6/user/wp/templates/normal.awt-en_CA 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_CA 2011-07-02 15:37:20.079404813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_GB abiword-libre-2.8.6/user/wp/templates/normal.awt-en_GB +--- abiword-2.8.6/user/wp/templates/normal.awt-en_GB 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_GB 2011-07-02 15:37:19.911320814 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_IE abiword-libre-2.8.6/user/wp/templates/normal.awt-en_IE +--- abiword-2.8.6/user/wp/templates/normal.awt-en_IE 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_IE 2011-07-02 15:37:20.075402813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_NZ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_NZ +--- abiword-2.8.6/user/wp/templates/normal.awt-en_NZ 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_NZ 2011-07-02 15:37:20.067398813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-en_ZA abiword-libre-2.8.6/user/wp/templates/normal.awt-en_ZA +--- abiword-2.8.6/user/wp/templates/normal.awt-en_ZA 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-en_ZA 2011-07-02 15:37:20.079404813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es abiword-libre-2.8.6/user/wp/templates/normal.awt-es +--- abiword-2.8.6/user/wp/templates/normal.awt-es 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es 2011-07-02 15:37:19.903316814 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_AR abiword-libre-2.8.6/user/wp/templates/normal.awt-es_AR +--- abiword-2.8.6/user/wp/templates/normal.awt-es_AR 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_AR 2011-07-02 15:37:20.039384813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_ES abiword-libre-2.8.6/user/wp/templates/normal.awt-es_ES +--- abiword-2.8.6/user/wp/templates/normal.awt-es_ES 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_ES 2011-07-02 15:37:20.063396813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_IR abiword-libre-2.8.6/user/wp/templates/normal.awt-es_IR +--- abiword-2.8.6/user/wp/templates/normal.awt-es_IR 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_IR 2011-07-02 15:37:20.011370813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-es_MX abiword-libre-2.8.6/user/wp/templates/normal.awt-es_MX +--- abiword-2.8.6/user/wp/templates/normal.awt-es_MX 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-es_MX 2011-07-02 15:37:19.919324814 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fa_IR abiword-libre-2.8.6/user/wp/templates/normal.awt-fa_IR +--- abiword-2.8.6/user/wp/templates/normal.awt-fa_IR 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fa_IR 2011-07-02 15:37:20.003366813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fi_FI abiword-libre-2.8.6/user/wp/templates/normal.awt-fi_FI +--- abiword-2.8.6/user/wp/templates/normal.awt-fi_FI 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fi_FI 2011-07-02 15:37:19.999364813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr abiword-libre-2.8.6/user/wp/templates/normal.awt-fr +--- abiword-2.8.6/user/wp/templates/normal.awt-fr 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr 2011-07-02 15:37:20.019374813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_BE abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_BE +--- abiword-2.8.6/user/wp/templates/normal.awt-fr_BE 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_BE 2011-07-02 15:37:20.075402813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_CA abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CA +--- abiword-2.8.6/user/wp/templates/normal.awt-fr_CA 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CA 2011-07-02 15:37:19.907318814 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_CH abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CH +--- abiword-2.8.6/user/wp/templates/normal.awt-fr_CH 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_CH 2011-07-02 15:37:19.899314814 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-fr_FR abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_FR +--- abiword-2.8.6/user/wp/templates/normal.awt-fr_FR 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-fr_FR 2011-07-02 15:37:19.983356813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-gl_ES abiword-libre-2.8.6/user/wp/templates/normal.awt-gl_ES +--- abiword-2.8.6/user/wp/templates/normal.awt-gl_ES 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-gl_ES 2011-07-02 15:37:20.023376813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-he abiword-libre-2.8.6/user/wp/templates/normal.awt-he +--- abiword-2.8.6/user/wp/templates/normal.awt-he 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-he 2011-07-02 15:37:19.995362813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-he_IL abiword-libre-2.8.6/user/wp/templates/normal.awt-he_IL +--- abiword-2.8.6/user/wp/templates/normal.awt-he_IL 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-he_IL 2011-07-02 15:37:19.979354813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-hu_HU abiword-libre-2.8.6/user/wp/templates/normal.awt-hu_HU +--- abiword-2.8.6/user/wp/templates/normal.awt-hu_HU 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-hu_HU 2011-07-02 15:37:19.979354813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-it_IT abiword-libre-2.8.6/user/wp/templates/normal.awt-it_IT +--- abiword-2.8.6/user/wp/templates/normal.awt-it_IT 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-it_IT 2011-07-02 15:37:19.911320814 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ja_JP abiword-libre-2.8.6/user/wp/templates/normal.awt-ja_JP +--- abiword-2.8.6/user/wp/templates/normal.awt-ja_JP 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ja_JP 2011-07-02 15:37:20.027378813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-lt_LT abiword-libre-2.8.6/user/wp/templates/normal.awt-lt_LT +--- abiword-2.8.6/user/wp/templates/normal.awt-lt_LT 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-lt_LT 2011-07-02 15:37:19.899314814 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-nb_NO abiword-libre-2.8.6/user/wp/templates/normal.awt-nb_NO +--- abiword-2.8.6/user/wp/templates/normal.awt-nb_NO 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-nb_NO 2011-07-02 15:37:19.999364813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-nl_NL abiword-libre-2.8.6/user/wp/templates/normal.awt-nl_NL +--- abiword-2.8.6/user/wp/templates/normal.awt-nl_NL 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-nl_NL 2011-07-02 15:37:19.911320814 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-nn_NO abiword-libre-2.8.6/user/wp/templates/normal.awt-nn_NO +--- abiword-2.8.6/user/wp/templates/normal.awt-nn_NO 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-nn_NO 2011-07-02 15:37:20.031380813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-pl_PL abiword-libre-2.8.6/user/wp/templates/normal.awt-pl_PL +--- abiword-2.8.6/user/wp/templates/normal.awt-pl_PL 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-pl_PL 2011-07-02 15:37:20.011370813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ps abiword-libre-2.8.6/user/wp/templates/normal.awt-ps +--- abiword-2.8.6/user/wp/templates/normal.awt-ps 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ps 2011-07-02 15:37:20.035382813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-pt_BR abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_BR +--- abiword-2.8.6/user/wp/templates/normal.awt-pt_BR 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_BR 2011-07-02 15:37:19.915322814 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-pt_PT abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_PT +--- abiword-2.8.6/user/wp/templates/normal.awt-pt_PT 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-pt_PT 2011-07-02 15:37:20.035382813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ru abiword-libre-2.8.6/user/wp/templates/normal.awt-ru +--- abiword-2.8.6/user/wp/templates/normal.awt-ru 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ru 2011-07-02 15:37:19.907318814 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ru_RU abiword-libre-2.8.6/user/wp/templates/normal.awt-ru_RU +--- abiword-2.8.6/user/wp/templates/normal.awt-ru_RU 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ru_RU 2011-07-02 15:37:19.919324814 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sk_SK abiword-libre-2.8.6/user/wp/templates/normal.awt-sk_SK +--- abiword-2.8.6/user/wp/templates/normal.awt-sk_SK 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sk_SK 2011-07-02 15:37:20.075402813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sl abiword-libre-2.8.6/user/wp/templates/normal.awt-sl +--- abiword-2.8.6/user/wp/templates/normal.awt-sl 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sl 2011-07-02 15:37:20.031380813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sv abiword-libre-2.8.6/user/wp/templates/normal.awt-sv +--- abiword-2.8.6/user/wp/templates/normal.awt-sv 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sv 2011-07-02 15:37:20.015372813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-sv_SE abiword-libre-2.8.6/user/wp/templates/normal.awt-sv_SE +--- abiword-2.8.6/user/wp/templates/normal.awt-sv_SE 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-sv_SE 2011-07-02 15:37:20.067398813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-syr abiword-libre-2.8.6/user/wp/templates/normal.awt-syr +--- abiword-2.8.6/user/wp/templates/normal.awt-syr 2007-01-14 12:52:46.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-syr 2011-07-02 15:37:20.079404813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-tr abiword-libre-2.8.6/user/wp/templates/normal.awt-tr +--- abiword-2.8.6/user/wp/templates/normal.awt-tr 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-tr 2011-07-02 15:37:19.903316814 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-tr_TR abiword-libre-2.8.6/user/wp/templates/normal.awt-tr_TR +--- abiword-2.8.6/user/wp/templates/normal.awt-tr_TR 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-tr_TR 2011-07-02 15:37:19.911320814 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-uk_UA abiword-libre-2.8.6/user/wp/templates/normal.awt-uk_UA +--- abiword-2.8.6/user/wp/templates/normal.awt-uk_UA 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-uk_UA 2011-07-02 15:37:20.003366813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-ur_PK abiword-libre-2.8.6/user/wp/templates/normal.awt-ur_PK +--- abiword-2.8.6/user/wp/templates/normal.awt-ur_PK 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-ur_PK 2011-07-02 15:37:20.067398813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-yi abiword-libre-2.8.6/user/wp/templates/normal.awt-yi +--- abiword-2.8.6/user/wp/templates/normal.awt-yi 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-yi 2011-07-02 15:37:19.919324814 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-zh_CN abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_CN +--- abiword-2.8.6/user/wp/templates/normal.awt-zh_CN 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_CN 2011-07-02 15:37:20.015372813 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/normal.awt-zh_TW abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_TW +--- abiword-2.8.6/user/wp/templates/normal.awt-zh_TW 2007-01-20 13:20:58.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/normal.awt-zh_TW 2011-07-02 15:37:19.907318814 -0300 +@@ -9,7 +9,7 @@ + + + +- ++ + + +
+diff -auNpr abiword-2.8.6/user/wp/templates/Press-Release.awt abiword-libre-2.8.6/user/wp/templates/Press-Release.awt +--- abiword-2.8.6/user/wp/templates/Press-Release.awt 2009-05-22 07:15:33.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/Press-Release.awt 2011-07-02 15:37:20.071400813 -0300 +@@ -16,19 +16,19 @@ + + + +- +- +- +- ++ ++ ++ ++ + + + +- ++ + + + + +- ++ + + + +@@ -36,19 +36,19 @@ + + + +- +- +- ++ ++ ++ + + + + +- +- +- ++ ++ ++ + + +- ++ + + + +@@ -77,7 +77,7 @@ +

+ + +-

FOR IMMEDIATE RELEASE

++

FOR IMMEDIATE RELEASE

+ + +

+diff -auNpr abiword-2.8.6/user/wp/templates/Resume.awt abiword-libre-2.8.6/user/wp/templates/Resume.awt +--- abiword-2.8.6/user/wp/templates/Resume.awt 2009-05-22 07:15:36.000000000 -0300 ++++ abiword-libre-2.8.6/user/wp/templates/Resume.awt 2011-07-02 15:37:20.031380813 -0300 +@@ -14,11 +14,11 @@ + Fri Mar 12 22:08:25 2004 + + +- +- +- +- +- ++ ++ ++ ++ ++ + + +
diff --git a/libre/iceweasel-i18n/Makefile b/libre/iceweasel-i18n/Makefile new file mode 100644 index 000000000..d596111f3 --- /dev/null +++ b/libre/iceweasel-i18n/Makefile @@ -0,0 +1,59 @@ +#!/usr/bin/make -f +# Use this script to update the PKGBUILD's list of langpacks. +# This script depends on: +# - coreutils +# - pacman +# - sed + +# Variables: +# This is to get it from Debian Sid +debname=iceweasel-l10n +debver=9.0+debian +debrel=1 +debrepo=http://ftp.debian.org/debian/pool/main/ + +pkgver=9.0 +pkgrel=2.1 + +# Guts: ############################################################## + +default: PHONY all +all: PHONY + $(MAKE) clean + $(MAKE) PKGBUILD +.PRECIOUS: PKGBUILD + +PKGBUILD.list: Makefile + sed \ + -e 's/@DEBNAME@/$(debname)/' \ + -e 's/@DEBVER@/$(debver)/' \ + -e 's/@DEBREL@/$(debrel)/' \ + -e 's%@DEBREPO@%$(debrepo)%' \ + -e 's/@PKGVER@/$(pkgver)/' \ + -e 's/@PKGREL@/$(pkgrel)/' \ + -e "s/@LANGPACKS@/(phony)/" \ + -e '/CUT HERE/,$$d' \ + PKGBUILD.in > $@ + echo 'package() { exit 0; }' >> $@ + makepkg -gp $@ >> $@ +langpacks.txt: PKGBUILD.list Makefile + makepkg -dp $< + ls src/*/upstream | sed 's/\.xpi//' > $@ +PKGBUILD: PKGBUILD.in langpacks.txt Makefile + sed \ + -e 's/@DEBNAME@/$(debname)/' \ + -e 's/@DEBVER@/$(debver)/' \ + -e 's/@DEBREL@/$(debrel)/' \ + -e 's%@DEBREPO@%$(debrepo)%' \ + -e 's/@PKGVER@/$(pkgver)/' \ + -e 's/@PKGREL@/$(pkgrel)/' \ + -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \ + -e '/CUT HERE/d' \ + -e '/md5sums/,$$d' \ + PKGBUILD.in > $@ + makepkg -dg >> $@ + +clean: PHONY + rm -f PKGBUILD.list langpacks.txt + +.PHONY: PHONY FORCE diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD new file mode 100644 index 000000000..0743504ee --- /dev/null +++ b/libre/iceweasel-i18n/PKGBUILD @@ -0,0 +1,142 @@ +# Maintainer: Luke Shumaker +# Contributor: fauno +# Contributor: Figue +# Based on icecat-i18n package, which is in turn based on firefox-i18n + +# When updating to a newer upstream release: +# - Edit variables in in Makefile. +# - (optionally) edit PKGBUILD.in +# - Run 'make'. It will take care of everything else for you. + +_debname=iceweasel +_debver=11.0 +_debrel=2 +_debrepo=http://ftp.debian.org/debian/pool/main/ +debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } + +_langpacks=(af ak ar as ast be bg bn-BD bn-IN br bs ca csb cs cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW zu) + +pkgbase=iceweasel-i18n +pkgname=($(for lang in ${_langpacks[@]} + do echo $pkgbase-$lang | tr A-Z a-z + done)) +_pkgver=10.0 +pkgver=${_debver}.${_debrel} +pkgrel=1 + +pkgdesc="Language packs for Debian Iceweasel." +arch=('any') +url="http://www.geticeweasel.org/" +license=('MPL') +depends=("iceweasel-libre>=$_pkgver") +source=() +for lang in ${_langpacks[@]} +do + source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb") +done + +build() { + cd "${srcdir}" + for f in *.deb + do + bsdtar xf $f + bsdtar xf data.tar.gz + done +} + +_path="/usr/lib/iceweasel/extensions" + + +for lang in ${_langpacks[@]} +do + eval " +package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() { + install -Dm644 \"\$srcdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@iceweasel.mozilla.org.xpi\" +} +" +done + +md5sums=('c11d65787c3f2848e0b582115e50c3ca' + 'f579bb571a43c33d6a13fd71f7853331' + '5ec94ba1055f11e8a33674a3ea623fca' + '7598e4409463c98c6f358a49c0e0e864' + 'f3a7156974b43a7829e68e82e6dd749a' + '2cd6d08c82a59cee5454d3da763d9808' + '3b5529e7d1a6c87e9a99b251bb008b9f' + 'f1eb67cbc423a49dd4b4f85e1f50034c' + '76c39cc1134b4074283fe080a1d0b29e' + '1b282bba90202701fa63fc21b44e78d5' + '77f818359b98fdd2a23b40989f9f56c6' + 'cbd8fb3d20a5269ac728c717ebd1d98c' + '83e2314c8b80d0fd551fa083d89cef70' + 'e68bed0670b4a82dbd66512e8ca130c7' + '48ea629311ec141de087474ad95fa122' + '9c1849045f0004e49c240061358b244f' + '72bce5d1aa3e6b21f6b7e7b6f2c8d4f2' + '224a5bb2ee4fdde8cc20e79a70e30eab' + 'e856bf522ad406c3b17e605a922a149f' + 'e522dd90baf0fdc61fbd45a496993fed' + 'adc195bb74d8d84f768ab0077c6c80b2' + 'a8012c48c890655c1ef1826f900f7cd3' + 'fad33e552bd6fb805a5c92325c649eff' + 'cad39ebafc45aad5d32f115fa1839ac0' + '238fa3a6a33cd30ad2712510cc578baa' + '5dadee4c8eca35353e811b93a6602860' + '67c7d7ab47d8cd636d6849f9fda68fe7' + 'b7cf88fe4b118aea853978c7ff43eb57' + 'c0aa19616cf37148a7f33789c9e88deb' + '806a1b78d92c1e6504051f2c6bf2cdcf' + '92ee27275709f2c81f229f40d032da23' + '6f7369cff0c0680f52394d9caee7b136' + '2adba18d2bd10051950f1b37325ddbce' + 'a2e1834d4b28fa8dea5b8d01adcedb7e' + '929bfa11831b267b419a1b09b4d614d4' + 'fe5ea0a2cc3ee9b45618517a2a6cd162' + '45cd4f3e44046bfdc78848d12a0983f9' + '7f7681277e566052e6831377b1bcd479' + 'f136cefdb1b7a8b9fc18cba540414fcc' + 'e714caf6fc74f9978ca5911310f33f10' + '7a745b384d1ee293decce327189d49e8' + '5b22c59215b6ce6d3fd588305a6429f6' + 'b6f1f722168a7e2dc70b02c199e96198' + 'e490e5a65c40cd60ba64e4511f1dcef1' + '640c52cb0b2e4f8ae0d7206fb3db3b33' + 'a42b31f567dcc8032360caa684df1c08' + 'd8da0314598179ac5c3479dd397d7827' + '7e065b66f0673c3801ee7f37ff33344d' + 'c8c5d1646483013fa249b3a839523e53' + 'abf1db7ea2e8014e135f324cf3efc141' + '8a352420c9580fe3c930a4b3c4d3530e' + '465ca43f628d0567b3de36626b54bf40' + '6cc860dae180ed5f80916759da290a9d' + 'b0d97a60501760c78f520ba4151427a7' + '829311af6d4d0d78378fdcfd2cfccc68' + 'b54daae60d32b270a44b891fdb61e3b5' + '39246a00ea31552326d0ea52f8eb1f05' + 'e49074be0a43ebc9810d89c24de75268' + '281f20486ae5b6caadfc5504e7f036ac' + '740c3a38b45788378c6c5db795d31ee1' + '296df42d755d93032b9a3dc619bc502d' + '74b59fa4676d2779f8e1081ac253b122' + 'a92960238a2c942c4b49b0f4187d0a71' + '230fbd4b3e6a65545b4a37ec1549d0e6' + 'e606f5a9db88334a6cb33086340f4ff7' + '0b52b803abe1acb1e137a57fe0497746' + '00ddf2c8c6adfcd51230dd469d01ec75' + '254303860ecc7c25157f08a4d55a4f68' + '70d037f9c5c8f25e2b335c7016f17b58' + 'b3da484dade70c544d4f0e6a829ef806' + '05347b208889b3e4aa86d9a6dccda71d' + 'a2212a06adac1aa6b74bc2f7e9de2af2' + '371d5e9b0a10feec5e05d3fdfd949bc6' + '63611b468b7d41a0470385e19a849a8d' + 'dc691a55cc7f95018e4178e6e794a1a4' + '90723a80c36b85006fa7514641cd2f2a' + '918683079f1d037d05a9a38b05d4ca51' + '77dda2b5fd59bcdb66918b4d13b486ae' + '33c2d8bff6cdf141614457c71fcf5d36' + '08990457e150c081e0f505515c15df09' + '379c5ede369994f016745e7dd83dfe54' + '15062007856eb66b04c26694a7f35727' + '569b1a54a9ca0b8149f151eb4cf57957' + '970928f01c78b094a2c054e58cd85bff') diff --git a/libre/iceweasel-i18n/PKGBUILD.in b/libre/iceweasel-i18n/PKGBUILD.in new file mode 100644 index 000000000..05477caef --- /dev/null +++ b/libre/iceweasel-i18n/PKGBUILD.in @@ -0,0 +1,63 @@ +# Maintainer: Luke Shumaker +# Contributor: fauno +# Contributor: Figue +# Based on icecat-i18n package, which is in turn based on firefox-i18n + +# When updating to a newer upstream release: +# - Edit variables in in Makefile. +# - (optionally) edit PKGBUILD.in +# - Run 'make'. It will take care of everything else for you. + +_debname=@DEBNAME@ +_debver=@DEBVER@ +_debrel=@DEBREL@ +_debrepo=@DEBREPO@ +debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } + +_langpacks=@LANGPACKS@ + +pkgbase=iceweasel-i18n +pkgname=($(for lang in ${_langpacks[@]} + do echo $pkgbase-$lang | tr A-Z a-z + done)) +_pkgver=@PKGVER@ +pkgver=${_debver}.${_debrel} +pkgrel=@PKGREL@ + +pkgdesc="Language packs for Debian Iceweasel." +arch=('any') +url="http://www.geticeweasel.org/" +license=('MPL') +depends=("iceweasel=$_pkgver") +source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.gz" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.diff.gz" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc") +noextract=($(for lang in ${_langpacks[@]} + do echo $lang.xpi + done)) + +dpkg-source() { + # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc + cd "${_debname}-${_debver}" + patch -p1 -i "${srcdir}/${_debname}_${_debver}-${_debrel}.diff" + cd .. +} + +build() { + cd "${srcdir}" + dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc +} + +_path="/usr/lib/iceweasel-${_pkgver}/extensions" + +# CUT HERE <-- Separates package_*() functions from everything else. + +for lang in ${_langpacks[@]} +do + eval " +package_iceweasel-i18n-$(echo $lang | tr A-Z a-z) () { + install -Dm644 '$srcdir/'*'/upstream/$lang.xpi' \"\$pkgdir\"'$_path/langpack-$lang@firefox.mozilla.org.xpi' +} +" +done + diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD new file mode 100644 index 000000000..3ef4da470 --- /dev/null +++ b/libre/iceweasel-libre/PKGBUILD @@ -0,0 +1,156 @@ +# Contributor (ConnochaetOS): Henry Jensen +# Contributor (Parabola): Luke Shumaker +# Contributor: Figue +# Contributor (Parabola): fauno +# Contributor (Parabola): vando +# Contributor (Arch): Jakub Schmidtke +# Thank you very much to the older contributors: +# Contributor: evr +# Contributor: Muhammad 'MJ' Jassim + +_pgo=false + +# We're getting this from Debian Sid +_debname=iceweasel +_debver=11.0 +_debrel=2 +_debrepo=http://ftp.debian.org/debian/pool/main/ +debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } + +_pkgname=iceweasel +pkgname=iceweasel-libre +pkgver=${_debver}.${_debrel} +pkgrel=1 + +if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi +if $_pgo; then + pkgname+='-pgo' +fi + +pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox." +arch=('i586' 'i686' 'x86_64' 'mips64el') +license=('GPL2' 'MPL' 'LGPL') +depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss>=3.13.1' 'sqlite3' 'startup-notification') +makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'wireless_tools' 'yasm' 'zip') +if $_pgo; then + makedepends+=('xorg-server-xvfb') + options=(!ccache) +fi + +url="http://www.geticeweasel.org/" +install=iceweasel.install +source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" + "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc" + mozconfig + mozconfig.pgo + xulrunner-copy-stub.patch + libre.patch + iceweasel-install-dir.patch + region.properties + vendor.js) +md5sums=('01d9d18909ca9fff2483d8fd779a0f89' + '59349da94b095fe0623d09ce75696766' + 'f407208a750cdc9bea3a6a3a3e42dd89' + 'eab149c1994ab14392e55af3abb08e80' + 'ac29b01c189f20abae2f3eef1618ffc0' + 'a485a2b5dc544a8a2bd40c985d2e5813' + 'addd3a3420cebeda152b447705b086e9' + 'e529742c0a425648087bc3ce537fe4c5' + 'f1c76e7e244257856a386ca2de69bdf0' + '0d053487907de4376d67d8f499c5502b') + +if [ "$_pkgname" != "$pkgname" ]; then + provides+=("$_pkgname=$pkgver") + conflicts+=("$_pkgname") +fi + +dpkg-source() { + # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc + export QUILT_PATCHES=debian/patches + export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' + export QUILT_DIFF_ARGS='--no-timestamps' + mv mozilla-release "${_debname}-${_debver}" + mv debian "${_debname}-${_debver}" + cd "${_debname}-${_debver}" + +# Doesn't apply and seems unimportant + rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true + + quilt push -a + find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this? + cd .. +} + +build() { +# Don't run this if we're using -e +if [ $NOEXTRACT -eq 0 ]; then + msg2 "Applying Debian patches..." + cd "${srcdir}" + dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc + + msg2 "Starting normal build..." + mv "${_debname}-${_debver}" "$srcdir/mozilla-build" + cd "$srcdir/mozilla-build" + + cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch + patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname + patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix + patch -Np1 -i "$srcdir/libre.patch" +fi + + cd "$srcdir/mozilla-build" + cp -f ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/ + + if $_pgo; then + cat "$srcdir/mozconfig.pgo" >> .mozconfig + fi + + # Fix PRE_RELEASE_SUFFIX + sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ + browser/base/Makefile.in + + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" + export PYTHON="/usr/bin/python2" + + if $_pgo; then + LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & + LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" + kill $! || true + else + LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" + fi +} + +package() { + cd "$srcdir/mozilla-build" + make -j1 -f client.mk DESTDIR="$pkgdir" install + + install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref" + + # I don't even know why we're hitting the objdir, and ConnOS didn't. + _brandingdir=debian/branding + brandingdir=moz-objdir/$_brandingdir + icondir="$pkgdir/usr/share/icons/hicolor" + for i in 16x16 32x32 48x48 64x64; do + install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png" + done + install -Dm644 "$brandingdir/mozicon128.png" "$icondir/128x128/apps/$_pkgname.png" + install -Dm644 "$_brandingdir/iceweasel_icon.svg" "$icondir/scalable/apps/$_pkgname.svg" + + install -d "$pkgdir/usr/share/applications" + install -m644 debian/iceweasel.desktop "$pkgdir/usr/share/applications" + #install -m644 debian/iceweasel-safe.desktop "$pkgdir/usr/share/applications" + + rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation" + ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$_pkgname/plugins" + ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins" + + # We don't want the development stuff + rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} + + # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850 + ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin" +} diff --git a/libre/iceweasel-libre/iceweasel-install-dir.patch b/libre/iceweasel-libre/iceweasel-install-dir.patch new file mode 100644 index 000000000..f80a3eca9 --- /dev/null +++ b/libre/iceweasel-libre/iceweasel-install-dir.patch @@ -0,0 +1,28 @@ +diff -Nur iceweasel-9.0.1.orig/config/autoconf.mk.in iceweasel-9.0.1/config/autoconf.mk.in +--- iceweasel-9.0.1.orig/config/autoconf.mk.in 2011-12-31 17:07:52.000000000 -0500 ++++ iceweasel-9.0.1/config/autoconf.mk.in 2011-12-31 17:11:18.000000000 -0500 +@@ -68,8 +68,8 @@ + mandir = @mandir@ + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_BASE_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + DIST = $(DEPTH)/dist + LIBXUL_SDK = @LIBXUL_SDK@ +diff -Nur iceweasel-9.0.1.orig/js/src/config/autoconf.mk.in iceweasel-9.0.1/js/src/config/autoconf.mk.in +--- iceweasel-9.0.1.orig/js/src/config/autoconf.mk.in 2011-12-20 18:28:21.000000000 -0500 ++++ iceweasel-9.0.1/js/src/config/autoconf.mk.in 2011-12-31 17:11:43.000000000 -0500 +@@ -60,8 +60,8 @@ + datadir = @datadir@ + mandir = @mandir@ + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + TOP_DIST = @TOP_DIST@ + ifneq (,$(filter /%,$(TOP_DIST))) diff --git a/libre/iceweasel-libre/iceweasel.install b/libre/iceweasel-libre/iceweasel.install new file mode 100644 index 000000000..c1fe8284a --- /dev/null +++ b/libre/iceweasel-libre/iceweasel.install @@ -0,0 +1,13 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch new file mode 100644 index 000000000..c1bb0a8c7 --- /dev/null +++ b/libre/iceweasel-libre/libre.patch @@ -0,0 +1,242 @@ +diff -urN iceweasel-9.0.1.orig/browser/app/profile/firefox.js iceweasel-9.0.1/browser/app/profile/firefox.js +--- mozilla-build/browser/app/profile/firefox.js.orig 2012-03-20 01:04:55.890545738 -0300 ++++ mozilla-build/browser/app/profile/firefox.js 2012-03-20 01:05:03.330545430 -0300 +@@ -64,11 +64,11 @@ + // Preferences for AMO integration + pref("extensions.getAddons.cache.enabled", true); + pref("extensions.getAddons.maxResults", 15); +-pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%"); +-pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); +-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%"); +-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=firefox"); +-pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%"); +++pref("extensions.getAddons.get.url", ""); +++pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html"); +++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html"); +++pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html"); +++pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html"); + + // Blocklist preferences + pref("extensions.blocklist.enabled", true); +@@ -80,7 +80,7 @@ + pref("extensions.autoDisableScopes", 15); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", ""); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -200,7 +200,7 @@ + pref("extensions.update.interval", 86400); // Check for updates to Extensions and + // Themes every day + // Non-symmetric (not shared by extensions) extension-specific [update] preferences +-pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas"); ++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes"); + pref("extensions.dss.enabled", false); // Dynamic Skin Switching + pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next + // restart. +@@ -234,7 +234,7 @@ + // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session + // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore + pref("browser.startup.page", 1); +-pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); ++pref("browser.startup.homepage", "about:home"); + + // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into + // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream +@@ -324,7 +324,7 @@ + pref("browser.download.manager.resumeOnWakeDelay", 10000); + + // search engines URL +-pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); ++pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); + + // pointer to the default engine name + pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +@@ -563,7 +563,7 @@ + pref("accessibility.typeaheadfind.flashBar", 1); + + // plugin finder service url +-pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); ++pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%"); + + // by default we show an infobar message when pages require plugins the user has not installed, or are outdated + pref("plugins.hide_infobar_for_missing_plugin", false); +diff -urN iceweasel-9.0.1.orig/browser/base/content/syncSetup.js iceweasel-9.0.1/browser/base/content/syncSetup.js +--- iceweasel-9.0.1.orig/browser/base/content/syncSetup.js 2011-12-16 20:29:12.000000000 +0000 ++++ iceweasel-9.0.1/browser/base/content/syncSetup.js 2011-12-21 10:05:15.888062669 +0000 +@@ -59,7 +59,7 @@ + // Broader than we'd like, but after this changed from api-secure.recaptcha.net + // we had no choice. At least we only do this for the duration of setup. + // See discussion in Bugs 508112 and 653307. +-const RECAPTCHA_DOMAIN = "https://www.google.com"; ++const RECAPTCHA_DOMAIN = "https://www.duckduckgo.com"; + + Cu.import("resource://services-sync/main.js"); + Cu.import("resource://gre/modules/XPCOMUtils.jsm"); +diff -urN iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties +--- iceweasel-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-21 09:55:31.032062468 +0000 +@@ -1,8 +1,8 @@ + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=DuckDuckGo + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Google ++browser.search.order.1=DuckDuckGo + browser.search.order.2=Yahoo + browser.search.order.3=Bing + +@@ -17,7 +17,7 @@ + # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site + # to be searched and the user's search query. Place them in the appropriate location + # for your locale's URL but do not translate them. +-browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} ++browser.search.siteSearchURL=http://duckduck.go.com/?q={searchTerms} + + # increment this number when anything gets changed in the list below. This will + # cause Firefox to re-read these prefs and inject any new handlers into the +diff -urN iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html iceweasel-9.0.1/build/pgo/blueprint/elements.html +--- iceweasel-9.0.1.orig/build/pgo/blueprint/elements.html 2011-12-16 20:29:13.000000000 +0000 ++++ iceweasel-9.0.1/build/pgo/blueprint/elements.html 2011-12-21 10:04:42.988062659 +0000 +@@ -143,7 +143,7 @@ +

+

+ <a> anchor
+- <a> a + href ++ <a> a + href +

+

+ <abbr> abbr - extended text when mouseover.
+diff -urN iceweasel-9.0.1.orig/dom/ipc/test.xul iceweasel-9.0.1/dom/ipc/test.xul +--- iceweasel-9.0.1.orig/dom/ipc/test.xul 2011-12-16 20:29:17.000000000 +0000 ++++ iceweasel-9.0.1/dom/ipc/test.xul 2011-12-21 10:03:33.224062635 +0000 +@@ -301,6 +301,6 @@ + oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> + + +- ++ +

@bookmarks_toolbarfolder@

+
@bookmarks_toolbarfolder_description@ +

+-

@getting_started@ ++
ConnochaetOS ++
Parabola +

+

@firefox_heading@

+

+-

@firefox_help@ +-
@firefox_customize@ +-
@firefox_community@ +-
@firefox_about@ ++
Free Software Foundation ++
LibrePlanet ++
Free addons +

+

diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig new file mode 100644 index 000000000..e79896323 --- /dev/null +++ b/libre/iceweasel-libre/mozconfig @@ -0,0 +1,55 @@ +. $topsrcdir/browser/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-gio + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +# Optimization +ac_add_options --enable-optimize + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir + +# Iceweasel +ac_add_options --disable-official-branding +ac_add_options --with-branding=debian/branding + +# ConnochaetOS +#ac_add_options --build=i586-pc-linux-gnu +#ac_add_options --host=i586-pc-linux-gnu +#export USE_SHORT_LIBNAME=1 +#mk_add_options USE_SHORT_LIBNAME=1 + +# Parabola +ac_add_options --disable-safe-browsing +export BUILD_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 + +# Build-generated diff --git a/libre/iceweasel-libre/mozconfig.pgo b/libre/iceweasel-libre/mozconfig.pgo new file mode 100644 index 000000000..b0c249ebf --- /dev/null +++ b/libre/iceweasel-libre/mozconfig.pgo @@ -0,0 +1,4 @@ +# PGO +ac_add_options --enable-profile-guided-optimization +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' diff --git a/libre/iceweasel-libre/region.properties b/libre/iceweasel-libre/region.properties new file mode 100644 index 000000000..2e980987e --- /dev/null +++ b/libre/iceweasel-libre/region.properties @@ -0,0 +1,23 @@ +# Default search engine +browser.search.defaultenginename=Duck Duck Go (SSL) + +# Search engine order (order displayed in the search bar dropdown)s +browser.search.order.1=Duck Duck Go (SSL) +browser.search.order.2=Duck Duck Go (Lite) + + +# Keyword URL (for location bar searches) +keyword.URL=https://duckduckgo.com/?q= + +# URL for site-specific search engines +# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site +# to be searched and the user's search query. Place them in the appropriate location +# for your locale's URL but do not translate them. +browser.search.siteSearchURL=https://duckduckgo.com/?q=site%3A{moz:domain}+{searchTerms} + +# increment this number when anything gets changed in the list below. This will +# cause Firefox to re-read these prefs and inject any new handlers into the +# profile database. Note that "new" is defined as "has a different URL"; this +# means that it's not possible to update the name of existing handler, so +# don't make any spelling errors here. +#gecko.handlerService.defaultHandlersVersion=3 diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js new file mode 100644 index 000000000..d8d606bc1 --- /dev/null +++ b/libre/iceweasel-libre/vendor.js @@ -0,0 +1,9 @@ +// Use LANG environment variable to choose locale +pref("intl.locale.matchOS", true); + +// Disable default browser checking. +pref("browser.shell.checkDefaultBrowser", false); + +// Don't disable our bundled extensions in the application directory +pref("extensions.autoDisableScopes", 11); +pref("extensions.shownSelectionUI", true); diff --git a/libre/iceweasel-libre/xulrunner-copy-stub.patch b/libre/iceweasel-libre/xulrunner-copy-stub.patch new file mode 100644 index 000000000..e3b8e9376 --- /dev/null +++ b/libre/iceweasel-libre/xulrunner-copy-stub.patch @@ -0,0 +1,11 @@ +--- iceweasel-9.0.1/browser/app/Makefile.in~ 2011-12-25 16:19:29.000000000 -0500 ++++ iceweasel-9.0.1/browser/app/Makefile.in 2011-12-25 16:19:55.000000000 -0500 +@@ -257,7 +257,7 @@ + else + ifdef LIBXUL_SDK + libs:: +- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) ++ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/iceweasel$(BIN_SUFFIX) + endif + endif + diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD new file mode 100644 index 000000000..c86c9514a --- /dev/null +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Luke Shumaker +# Contributor: Figue +# Contributor (Parabola): fauno +# Contributor (Parabola): vando +# Thank you very much to the older contributors: +# Contributor: evr +# Contributor: Muhammad 'MJ' Jassim + +pkgname=mozilla-searchplugins +pkgver=1.0 +pkgrel=1 +pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers." +arch=('any') +license=('MPL' 'GPL' 'LGPL') +url="https://parabolagnulinux.org/" +source=( + duck-duck-go-lite.xml + duck-duck-go-ssl.xml + internet-archive.xml + jamendo-en.xml + logless-search.xml + scroogle-ssl-english.xml + wikipedia.xml + yacy.xml +) + +package() { + install -m755 -d "${pkgdir}/usr/lib/mozilla/searchplugins" + install -m644 "${srcdir}"/*.xml "${pkgdir}/usr/lib/mozilla/searchplugins" +} + +md5sums=('e1bda0854de7d764f7401c81bb82b5ef' + 'c5f00b6b24222aacd5a749d1f59c4d24' + '462c68585461f8cdc23c93c46f6ee4cf' + '2d492295c4308f9bba9ece28d8b3af2d' + '937ac0e5392b060d93bd33e761fbfa51' + 'cf97082e77e3ef5f1bd74b1db9329965' + 'c35f4971feff8387e0570d7a165eb6fa' + '24528ca3f7f1e1a0ba735231aa3ac1de') diff --git a/libre/mozilla-searchplugins/duck-duck-go-lite.xml b/libre/mozilla-searchplugins/duck-duck-go-lite.xml new file mode 100644 index 000000000..3142d3410 --- /dev/null +++ b/libre/mozilla-searchplugins/duck-duck-go-lite.xml @@ -0,0 +1,8 @@ + +Duck Duck Go (Lite) +Search Duck Duck Go (Lite) +UTF-8 +data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA== + + + \ No newline at end of file diff --git a/libre/mozilla-searchplugins/duck-duck-go-ssl.xml b/libre/mozilla-searchplugins/duck-duck-go-ssl.xml new file mode 100644 index 000000000..4fb1391ab --- /dev/null +++ b/libre/mozilla-searchplugins/duck-duck-go-ssl.xml @@ -0,0 +1,8 @@ + +Duck Duck Go (SSL) +Search Duck Duck Go (SSL) +UTF-8 +data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA== + + + \ No newline at end of file diff --git a/libre/mozilla-searchplugins/internet-archive.xml b/libre/mozilla-searchplugins/internet-archive.xml new file mode 100644 index 000000000..1556a2d8c --- /dev/null +++ b/libre/mozilla-searchplugins/internet-archive.xml @@ -0,0 +1,12 @@ + +Internet Archive +Search www.archive.org +ISO-8859-1 +data:image/x-icon;base64,R0lGODlhEAAQAPf0ABQAABMTERQTEhcXFxUYFRscGCwWEzYQDSAkHiAhICEiISQkIiUmJScnJSkpKSsrKi8vLDcvKjM0LzE1Mjc3NjU6Nj44NTw9OT0+Pj4/PD9CQUYdF00lJEE0KkQ9N0Y9NFItLFUvL1wzLFc/PV01MGE8PWU/OWk5NGo7OkBAP0RFREVJRURJRkVLR0ZIRkdJSUZLSEhMS0pPTFZOSllDQlZXVWFJRWVKQWRLRGtPRG9KSWxQRWxRRmhQTHJCQnFDRHVEQHZFQHpLS3hKTHlNSn5PSn5PTXxOUHRWTXBeU29jXXtgWHxjXn1mZIBQS4BQUIJZUoBZWIVeXYhfW4ZsX41jXYlrXoxuX4RuYoppYotza5NlZ5Zua5J4bpt5ZpaDeaKBb42MiY6MiY6NiY+QjJGIhZGKhZiLgp+IgJGRjJOSjZKSj5SWjpSTkJWVkJWUkpaUkZaVkquLgKmMgayPgK6Sh6mWj6ycj7GQgbKSgLWSgrqXi7maj7Sck7Smn72ilK+so6ytqbanobKppLysoLytor6uprqxqr2wqr+zrL23tMOklsCroMKvpcWqoMSsocStocSupcS1qce2rMa6r8m1rsO8ssa4sM65sty5q9C6sc3DttbEvdbKv9nFt9rHvODAsuDIuuHLvufKvurNvNDLwtDPy9nLwN3Oxt3Xz+TMwODQxuPTxuXRxefRxuHWzO3Ux+/WxunXy+vWyO3XzujYyuzYy+7bz+HZ0eHZ1eLc0uXc0+bc2Ore0u7c0O/f0vHf1eTg2+/h1O/h1u/j2u/m2vDh0/Hg1vDi1fHi1fPh1fPh1/bg1vLq3fXr3/ng1vjl2fnk2fTr5fTs4vHu6Pfw5vb07vnz5vvy5/zy5vry6Pv06vj17/7y6v/17fz47/757v/57v/38Pr58/358f358//68P778v/68/z89v/99f/+9f//9P7+9///9/z8+f//+P//+/7+/v///v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAj+ALeUoDHjAosYKlKsaAHjhYsMgYaAAGABggwNDgbUqMAAgwIKa47oMBChwIQHAQRIQEAgQYMFYX6EGFEmDZk2ceCoYePmjZgxpnxEaSKPntGjR+fRi/dESo9y3MYFy8ULl65Sit6loyaEgw14qQANQuTn0pkPHsxYa2eEC5Nu0ywlMmSn0Z0OSg6RW4fiAA512nahqoQGkqckgqShO+ekypJw2F6titTlTywsnLxtY3diww135k59cjRnESkqmMR9YwdEBI9imwoxqiMHTx4rmohVAxdExI5Wkgg94rNHj5crWr5QulYESo5bxmqJGgUqExg6fSZ1akaEBBJXvlgfybI1C1YoVbSA9XI2xUSWZ9B+IROWTFk0ZsuODcsWEAA7 +7 +http://mycroft.mozdev.org/update.php/id0/archive.src +http://mycroft.mozdev.org/update.php/id0/archive.gif +http://www.archive.org/ + + + \ No newline at end of file diff --git a/libre/mozilla-searchplugins/jamendo-en.xml b/libre/mozilla-searchplugins/jamendo-en.xml new file mode 100644 index 000000000..91d6df6e4 --- /dev/null +++ b/libre/mozilla-searchplugins/jamendo-en.xml @@ -0,0 +1,12 @@ + +Jamendo (en) +Search Jamendo.com English site for downloadable Creative Commons music +UTF-8 +data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABh0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjMxN4N3hgAAAqZJREFUOE9tk21IU2EUx+9S+tAXbZt6J4GRkEFQEQsKsb7W1ySCoK+9iCK9WKvMlZmKI8jqgw0JS52ZpQ4D7RV6IUmIqVGjgl6md0uf3dmcq3nvdv+dezfvNHvgD889z/n/zrn33MfApZfhpSMnu2hN5sGMFVzzori+jUk4nplhuMUfCISXnQc6+VJ21+INdluQFP+PFuKWjz9u8/sWAwz+Tn4nmVjabIF4vwChviKIvesh9hSkoDpEzS3RIGS20kN4wRxyb0b0fRNk0YNEVCD5ILMRREcvaLBkZxro11SXxcpNd1ladPPAVkjCYygJCSH/DEJCCIqiQF1KYh6xry6CbNAhVLyK09u+l0+VGylTRiKeQG9dP5xlTvi8E2lIPIbIyDH9daj4eArAQ21dDr7TqsWlONpPtMO23Yb6/Q3wvvVqcXVJ/mcQHxTqEI51WcBceZh5WILE3IQO6KjqgG3HGVRYK1G15zRGX49pncjiGEL9W8jDQ/VyrI02bXn0xYsRj/iWA7ZVoqy4HE+6nyYBzAOxe5PmUb0cc+aC3cyFeGcjpMBIGnCSOqBXqN1bhzcDw5AlWTub/zYE1lqgeVQvx67ngDWTruVi7pUdoAnE5QT66t1wnXNB+OKnCaQmIc1hdvAQ5ZuTHvJyP6+YW5iDAg4TxBtFiH3ogSL9gegPIxKK0lTUGSpQ5iP4PdyM4FWqTrnkkScd5iZOuGy2sjpzmF2iICnYtBaRIRukz4OIB8YhCx6CujHrLgerp++VyhNqTU76Dw3a3+irNu6atpuCJGg6n0WJ+WCNhWAN68BqeS22cD5ZbWq9uHvVyiX3Qag2lU7ZTV4dYjdiuiYldZ+CU17P88NZq/93W7lPp4xZlFiRhqQ6IvP3s8ZHUzWmIy+OZi8x/wVGO4LYiOwxygAAAABJRU5ErkJggg== +7 +http://mycroft.mozdev.org/updateos.php/id0/jamendo.xml +http://mycroft.mozdev.org/updateos.php/id0/jamendo.ico +http://www.jamendo.com/en + + + \ No newline at end of file diff --git a/libre/mozilla-searchplugins/logless-search.xml b/libre/mozilla-searchplugins/logless-search.xml new file mode 100644 index 000000000..1538d1ef0 --- /dev/null +++ b/libre/mozilla-searchplugins/logless-search.xml @@ -0,0 +1,8 @@ + +Logless Search +Use logless.com to search the Internet in privacy, with no search logs. +UTF-8 +data:image/x-icon;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABKo4NSnYdKl4FmtZ52uKdKb2cjQDwQKzoSMS1Ka2lzqJRlt51VmI5MgnVHk4BpoJRPoohMiXZUo4xctJteoZAmT00jPUEYLzoRSToxVVdhhYJ/saCXgnS1cWKykH+KoptfjoBDempaoo5dtZdViXw9TFsuOkghMjoYVVIvTlded36Vm5Lol4X5lIPQlImft62IhnpTfXGMtqxquaJSkYU5Qlk6OFE+SFwzV3dLVW1teoNvo5SPppSNoJR4mJZ7uqhyj3xbg3iGuK1btZxQm4pHSmFHOV48RWhFOWpbRXFgd4BSq5JHqJJQrplprp95uqdVj3xTi3xZsptauphfqZRLRWA/LFozMVhGGEhYOmdUgIJIqo5EqJBPr5ZbspxuuqU7fWNakXpjqY9kvJxhuZ5RYGUvMEgvFSchID9ZM1JMbG1HrpZGpo1QnYZaoJJXpZI0dFqKk3m+mISen4ieln2BPTJuGxeIGhNrFRKHEQ2VLiOCa1xsnIhaf39tlJN6rKVFc1+bmH/vloDshW7oZE+wLR+7MBvHMButJRK9MibhUzzkVj7eXUTBa2yOkYuMuaMtQDS1iHP0gWrpel3dZUnIZEnbWT3aPyXkX0T/k3v0WkD6alH3clv4c1bweGDloIdlSD/ZeWXWdl/sdlvvc1jpe2Pvc1fqUzrudl38hG33aE38dVv8j3f5lXz/inLro42JZluAY13YcGDxgGb1hWj3f2f+iWv0cFT8sZH8kXj7fGP6fGH2e2D/mH/oqY7Vr5pIV1WiY1fYeWbMgHPklXnuj3T9jGr9mXj8nH/7jnT7lHv8knb6kHD/j3S/uZujw7NeXGSWXFSNbGbDi4e6p5HZnYb6kXP6nYP7l4D4qI/irpjaq5D/o4r3o4jZtJu0u7FRRlNpTFyEXWaygnmsrKGprp7SqpXno5X1rJf1wazLuqTQr5rqrKDXuKXbtaDGt6w7ITVQLUaEdHqwu7KpvLOArJ+VpZ+3oqCoqp/App7YnpDimIy2qJ20r6S1r6WhuasAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + + + diff --git a/libre/mozilla-searchplugins/scroogle-ssl-english.xml b/libre/mozilla-searchplugins/scroogle-ssl-english.xml new file mode 100644 index 000000000..f817dce40 --- /dev/null +++ b/libre/mozilla-searchplugins/scroogle-ssl-english.xml @@ -0,0 +1,14 @@ + +Scroogle SSL English +Scroogle SSL English +UTF-8 +data:image/x-icon;base64,AAABAAEAEBAQAAAAAAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAICAgAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAACZmZmZAAAAmZmZmZmZAAmZqqqqqpmQCZmQAAAAqZCZqQAAAAAKmZmgAAAAAAqZmaAACaoACpmZoACZAAAKmZmgAKkAAAqZmaAACpmaqpmZoAAAAAAKmZmqAAAAAAqZCZqgAAAJmZAJmaqqqqqZkACZmZmZmZkAAACZmZmZAADwDzgFwAPgA4ABAHyAAQAAAAAAAAAAAAAAAAAAAAAAAAAA4AMAAOADAAAAfAAAAHyAAeADgAHgA8ADAADwDwAA +7 +http://mycroft.mozdev.org/updateos.php/id0/scroogle_ssl_en_post.xml +http://mycroft.mozdev.org/updateos.php/id0/scroogle_ssl_en_post.ico +https://ssl.scroogle.org/scrapen8.html + + + + + \ No newline at end of file diff --git a/libre/mozilla-searchplugins/wikipedia.xml b/libre/mozilla-searchplugins/wikipedia.xml new file mode 100644 index 000000000..36b8ed494 --- /dev/null +++ b/libre/mozilla-searchplugins/wikipedia.xml @@ -0,0 +1,15 @@ + +Wikipedia (en) +Wikipedia, the free encyclopedia +UTF-8 +data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9%2FAAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB%2FWvXoYiIiIfEZfWBSIiIEGi%2FfoqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF%2BiDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + + + + + + + + +http://en.wikipedia.org/wiki/Special:Search + diff --git a/libre/mozilla-searchplugins/yacy.xml b/libre/mozilla-searchplugins/yacy.xml new file mode 100644 index 000000000..61201ad20 --- /dev/null +++ b/libre/mozilla-searchplugins/yacy.xml @@ -0,0 +1,9 @@ + +YaCy +YaCy is an open-source GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer 'kupferhammer-keller'. +UTF-8 +data:image/x-icon,%00%00%01%00%01%00%10%10%00%00%01%00%18%00h%2B%00%00%16%00%00%00(%00%00%00%10%00%00%00%20%00%00%00%01%00%18%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%CE%BD%7B%DE%CE%9C%8CkRkJ1kJ1kJ1kJ1kJ1sR9%C6%B5%9C%E7%DE%BD%E7%DE%BD%E7%DE%C6%E7%DE%C6%EF%EF%CE%DE%DE%AD%DE%CE%9C%BD%ADs%7BZ)%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%A5%8CJ%8CkB%CE%BD%84%CE%BD%84%CE%C6%8C%DE%CE%9C%DE%CE%A5%EF%EF%CE%DE%CE%9C%BD%ADkkJ)%D6%C6%8C%F7%F7%E7%F7%F7%E7%F7%F7%E7%F7%F7%E7%CE%BD%84%8Ck9%CE%BD%7B%CE%BD%84%CE%BD%84%CE%C6%8C%DE%CE%9C%EF%EF%CE%DE%CE%9C%C6%B5kkJ)%BD%ADk%EF%EF%CE%EF%EF%CE%EF%EF%CE%F7%F7%E7%DE%CE%A5%7BZ)%CE%BD%7B%CE%BD%7B%CE%BD%84%CE%BD%84%CE%C6%8C%E7%DE%C6%DE%CE%9C%C6%B5ksR9%A5%8CJ%DE%DE%AD%E7%DE%BD%EF%EF%CE%F7%F7%E7%E7%DE%C6%7BZ)%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%84%CE%BD%84%E7%DE%BD%CE%C6%8C%C6%ADk%94%7BB%94%7BB%EF%EF%CE%F7%F7%E7%F7%F7%E7%F7%F7%E7%EF%EF%CE%8Ck9%A5%8CZ%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%84%E7%DE%BD%CE%C6%8C%C6%ADk%A5%8CZ%7BZ)%E7%DE%BD%F7%F7%E7%EF%EF%CE%EF%EF%DE%EF%EF%DE%A5%8CZ%8CkB%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%E7%DE%BD%CE%BD%84%B8%A7d%BD%ADZkJ)%DE%DE%AD%F7%F7%E7%DE%DE%AD%EF%EF%CE%EF%EF%DE%BD%ADkkJ)%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%DE%D6%B5%CE%BD%7B%BD%ADZ%BD%ACikJ)%DE%CE%9C%F7%F7%E7%E7%DE%BD%EF%EF%CE%F7%F7%E7%CE%BD%7BZ1%18%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%7B%DE%DE%AD%CE%BD%7B%BD%ADZ%BD%ADZ%7BZ)%C6%AD%7B%F7%F7%E7%E7%DE%BD%E7%DE%BD%F7%F7%E7%DE%CE%9CkJ)sR9%A5%8CZ%CE%BD%7B%CE%BD%7B%DE%DE%AD%CE%BD%7B%BD%ADZ%BD%ADZ%8Ck9%AD%9CZ%F7%F7%E7%EF%EF%CE%DE%CE%9C%F7%F7%E7%E7%DE%BD%BD%ADZ%9C%8CJZ1%18%A5%8CZ%CE%BD%7B%DE%DE%AD%C6%B5k%B5%A5J%BD%ADZ%94%7B9%9C%8CJ%F7%F7%E7%EF%EF%DE%CE%BD%84%F7%F7%E7%F7%EF%E7%EF%EF%CE%DE%CE%9C%9C%8CJkJ)%BD%ADk%DE%CE%A5%BD%ADk%AD%9CJ%B5%A5J%9C%8CJ%8Ck9%DE%CE%9C%DE%D6%9C%C6%B5Z%DE%CE%9C%F7%EF%DE%FF%FF%FF%EF%EF%DE%BD%ADZZ1!%BD%ADk%DE%CE%A5%BD%ADZ%AD%9CJ%AD%9CJ%AD%9CJsJ)kR)kR)kJ)%9C%8CJ%DE%CE%9C%F7%EF%DE%DE%DE%AD%94%7B9c9!%BD%ADk%DE%CE%A5%B5%9CR%AD%9CJ%AD%9CJ%AD%9CJ%AD%9CJ%B5%9CJ%B5%9CR%94%7BBc9%18%8Ck9%A5%8CJ%8Cs9Z1!%9C%8CR%CE%BD%84%DE%CE%9C%94%849%B5%9CR%BD%ADZ%BD%ADk%C6%B5k%CE%BD%7B%CE%BD%7B%CE%BD%7B%BD%ADskJ1R)%18kJ1%C6%AD%84%DE%CE%9C%DE%CE%9C%CE%BD%7B%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00 + + + + diff --git a/staging/libreoffice/PKGBUILD b/staging/libreoffice/PKGBUILD index 7b50bdb65..07f3c14e5 100644 --- a/staging/libreoffice/PKGBUILD +++ b/staging/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 154787 2012-03-30 17:12:40Z andyrtr $ +# $Id: PKGBUILD 154994 2012-04-01 08:55:21Z andyrtr $ # Maintainer: AndyRTR pkgbase="libreoffice" @@ -21,7 +21,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-report-builder') _LOver=3.5.1.2 pkgver=3.5.1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -33,7 +33,7 @@ makedepends=( # makedepends #'saxon' - currently broken # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' #"icu>=49.1" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests @@ -46,7 +46,6 @@ _mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" _additional_source_url="http://dev-www.libreoffice.org/src" source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - ${_additional_source_url}/314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz ${_additional_source_url}/d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip @@ -77,10 +76,10 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz gmake_install.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=1048d8fa4abd3e55a45dfb6884db808da1d72c9e smp_buildfix.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=cf23f57ae6bb7af689a45e0a850c3c2f67a8f810 buildfix_kde4fpicker.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=ee67c55260ec7723c39606955ccdbd3e2934935a + buildfix_icu49.diff libreoffice-common.sh libreoffice-common.csh) noextract=(d28864eb2b59bb57b034c0d4662a3cee-libvisio-0.0.15.tar.bz2 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz - 314e582264c36b3735466c522899aa07-icu4c-4_4_2-src.tgz 185d60944ea767075d27247c3162b3bc-unowinreg.dll 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip @@ -111,7 +110,6 @@ md5sums=('1edf0d39a7a921f6415f6a6ec7b314b3' '607b544cd7b38f9e6db6fe7da25007a7' 'a3fa7818bfab14a6cccec645193e9982' '18f577b374d60b3c760a3a3350407632' - '314e582264c36b3735466c522899aa07' 'd28864eb2b59bb57b034c0d4662a3cee' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -142,6 +140,7 @@ md5sums=('1edf0d39a7a921f6415f6a6ec7b314b3' '60ce5dc9bd098f95c2e621a930c98dd9' '661a52a02a31b3afbe4b3b3146061afd' '15fe8b5d79fbdc0b6bc2b454086671e7' + '9734ea20c9f67e1b6e1c5a1247fbd3ff' '32fcd844935434807e68d7bd06b94f09' '06a45184aefe078c4314e002ba666b52') @@ -168,6 +167,7 @@ build() { patch -Np1 -i ${srcdir}/gmake_install.diff patch -Np1 -i ${srcdir}/smp_buildfix.diff patch -Np1 -i ${srcdir}/buildfix_kde4fpicker.diff + patch -Np0 -i ${srcdir}/buildfix_icu49.diff # unset C(XX)FLAGS # http://www.openoffice.org/issues/show_bug.cgi?id=103205 @@ -220,7 +220,6 @@ build() { --without-afms\ --without-ppds\ --without-system-libwps\ - --without-system-icu \ --without-system-mdds\ --without-myspell-dicts \ --without-system-libvisio \ @@ -287,7 +286,7 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=${pkgbase}.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' #"icu>=4.6" + 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') #'saxon' optdepends=('libreoffice-langpack: additional language support' diff --git a/staging/libreoffice/buildfix_icu49.diff b/staging/libreoffice/buildfix_icu49.diff new file mode 100644 index 000000000..7a774dee0 --- /dev/null +++ b/staging/libreoffice/buildfix_icu49.diff @@ -0,0 +1,42 @@ +https://bugs.gentoo.org/show_bug.cgi?id=410307 + +--- i18npool/source/breakiterator/data/char_in.txt ++++ i18npool/source/breakiterator/data/char_in.txt +@@ -15,7 +15,7 @@ + $CR = [\p{Grapheme_Cluster_Break = CR}]; + $LF = [\p{Grapheme_Cluster_Break = LF}]; + $Control = [\p{Grapheme_Cluster_Break = Control}]; +-$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; ++# $Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; + $Extend = [\p{Grapheme_Cluster_Break = Extend}]; + $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; + $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1]; +@@ -72,7 +72,7 @@ + [^$Control $CR $LF] $Extend; + + [^$Control $CR $LF] $SpacingMark; +-$Prepend [^$Control $CR $LF]; ++# $Prepend [^$Control $CR $LF]; + + + ## ------------------------------------------------- +@@ -94,7 +94,7 @@ + + $Extend [^$Control $CR $LF]; + $SpacingMark [^$Control $CR $LF]; +-[^$Control $CR $LF] $Prepend; ++# [^$Control $CR $LF] $Prepend; + + + ## ------------------------------------------------- +--- i18npool/source/breakiterator/data/char.txt ++++ i18npool/source/breakiterator/data/char.txt +@@ -16,7 +16,7 @@ + $CR = [\p{Grapheme_Cluster_Break = CR}]; + $LF = [\p{Grapheme_Cluster_Break = LF}]; + $Control = [\p{Grapheme_Cluster_Break = Control}]; +-$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; ++# $Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; + $Extend = [\p{Grapheme_Cluster_Break = Extend}]; + $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; + # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data diff --git a/staging/php/PKGBUILD b/staging/php/PKGBUILD new file mode 100644 index 000000000..caa432a55 --- /dev/null +++ b/staging/php/PKGBUILD @@ -0,0 +1,368 @@ +# $Id: PKGBUILD 155298 2012-04-01 12:45:44Z pierre $ +# Maintainer: Pierre Schmitz + +pkgbase=php +pkgname=('php' + 'php-cgi' + 'php-apache' + 'php-fpm' + 'php-embed' + 'php-pear' + 'php-enchant' + 'php-gd' + 'php-intl' + 'php-ldap' + 'php-mcrypt' + 'php-mssql' + 'php-odbc' + 'php-pgsql' + 'php-pspell' + 'php-snmp' + 'php-sqlite' + 'php-tidy' + 'php-xsl') +pkgver=5.3.10 +_suhosinver=5.3.9-0.9.10 +pkgrel=5 +arch=('i686' 'x86_64') +license=('PHP') +url='http://www.php.net' +makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' + 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds' + 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu' + 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2') +source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2" + "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz" + "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig" + 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch' + 'logrotate.d.php-fpm' 'pcre_info.patch') +md5sums=('816259e5ca7d0a7e943e56a3bb32b17f' + 'c099b3d7eac95018ababd41ded7f3066' + 'c15d18f846be1d69144a5d0056ee6506' + 'ffc338e8ce2a990f6f2a486355bbab65' + 'dec2cbaad64e3abf4f0ec70e1de4e8e9' + 'b01be5f816988fcee7e78225836e5e27' + '740ec5fe2ecfd9d7febd4081c90ec65b' + '07c4e412909ac65a44ec90e7a2c4bade' + '8d3806bbb19e390f9b32ccf21611d937') + +build() { + phpconfig="--srcdir=../${pkgbase}-${pkgver} \ + --prefix=/usr \ + --sysconfdir=/etc/php \ + --localstatedir=/var \ + --with-layout=GNU \ + --with-config-file-path=/etc/php \ + --with-config-file-scan-dir=/etc/php/conf.d \ + --enable-inline-optimization \ + --disable-debug \ + --disable-rpath \ + --disable-static \ + --enable-shared \ + --mandir=/usr/share/man \ + --without-pear \ + " + + phpextensions="--enable-bcmath=shared \ + --enable-calendar=shared \ + --enable-dba=shared \ + --enable-exif=shared \ + --enable-ftp=shared \ + --enable-gd-native-ttf \ + --enable-intl=shared \ + --enable-json=shared \ + --enable-mbregex \ + --enable-mbstring \ + --enable-pdo \ + --enable-phar=shared \ + --enable-posix=shared \ + --enable-session \ + --enable-shmop=shared \ + --enable-soap=shared \ + --enable-sockets=shared \ + --enable-sqlite-utf8 \ + --enable-sysvmsg=shared \ + --enable-sysvsem=shared \ + --enable-sysvshm=shared \ + --enable-xml \ + --enable-zip=shared \ + --with-bz2=shared \ + --with-curl=shared \ + --with-db4=/usr \ + --with-enchant=shared,/usr \ + --with-freetype-dir=shared,/usr \ + --with-gd=shared \ + --with-gdbm=shared \ + --with-gettext=shared \ + --with-gmp=shared \ + --with-iconv=shared \ + --with-icu-dir=/usr \ + --with-imap-ssl=shared \ + --with-imap=shared \ + --with-jpeg-dir=shared,/usr \ + --with-ldap=shared \ + --with-ldap-sasl \ + --with-mcrypt=shared \ + --with-mhash \ + --with-mssql=shared \ + --with-mysql-sock=/var/run/mysqld/mysqld.sock \ + --with-mysql=shared,mysqlnd \ + --with-mysqli=shared,mysqlnd \ + --with-openssl=shared \ + --with-pcre-regex=/usr \ + --with-pdo-mysql=shared,mysqlnd \ + --with-pdo-odbc=shared,unixODBC,/usr \ + --with-pdo-pgsql=shared \ + --with-pdo-sqlite=shared,/usr \ + --with-pgsql=shared \ + --with-png-dir=shared,/usr \ + --with-pspell=shared \ + --with-regex=php \ + --with-snmp=shared \ + --with-sqlite3=shared,/usr \ + --with-sqlite=shared \ + --with-tidy=shared \ + --with-unixODBC=shared,/usr \ + --with-xmlrpc=shared \ + --with-xsl=shared \ + --with-zlib \ + --without-db2 \ + --without-db3 \ + " + + EXTENSION_DIR=/usr/lib/php/modules + export EXTENSION_DIR + PEAR_INSTALLDIR=/usr/share/pear + export PEAR_INSTALLDIR + + cd ${srcdir}/${pkgbase}-${pkgver} + + patch -p1 -i ${srcdir}/pcre_info.patch + + # apply suhosin patch + patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch + + # adjust paths + patch -p0 -i ${srcdir}/php.ini.patch + patch -p0 -i ${srcdir}/php-fpm.conf.in.patch + + # php + mkdir ${srcdir}/build-php + cd ${srcdir}/build-php + ln -s ../${pkgbase}-${pkgver}/configure + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + ${phpextensions} + make + + # cgi and fcgi + # reuse the previous run; this will save us a lot of time + cp -a ${srcdir}/build-php ${srcdir}/build-cgi + cd ${srcdir}/build-cgi + ./configure ${phpconfig} \ + --disable-cli \ + --enable-cgi \ + ${phpextensions} + make + + # apache + cp -a ${srcdir}/build-php ${srcdir}/build-apache + cd ${srcdir}/build-apache + ./configure ${phpconfig} \ + --disable-cli \ + --with-apxs2 \ + ${phpextensions} + make + + # fpm + cp -a ${srcdir}/build-php ${srcdir}/build-fpm + cd ${srcdir}/build-fpm + ./configure ${phpconfig} \ + --disable-cli \ + --enable-fpm \ + --with-fpm-user=http \ + --with-fpm-group=http \ + ${phpextensions} + make + + # embed + cp -a ${srcdir}/build-php ${srcdir}/build-embed + cd ${srcdir}/build-embed + ./configure ${phpconfig} \ + --disable-cli \ + --enable-embed=shared \ + ${phpextensions} + make + + # pear + cp -a ${srcdir}/build-php ${srcdir}/build-pear + cd ${srcdir}/build-pear + ./configure ${phpconfig} \ + --disable-cgi \ + --with-readline \ + --enable-pcntl \ + --with-pear \ + ${phpextensions} + make +} + +# check() { +# cd ${srcdir}/build-php +# make test +# } + +package_php() { + pkgdesc='An HTML-embedded scripting language' + depends=('pcre' 'libxml2' 'bzip2' 'curl') + replaces=('php-fileinfo' 'php-gmp' 'php-curl') + provides=('php-fileinfo' 'php-gmp' 'php-curl') + conflicts=('php-fileinfo' 'php-gmp' 'php-curl') + backup=('etc/php/php.ini') + + cd ${srcdir}/build-php + make -j1 INSTALL_ROOT=${pkgdir} install + install -d -m755 ${pkgdir}/usr/share/pear + # install php.ini + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini + install -d -m755 ${pkgdir}/etc/php/conf.d/ + + # remove static modules + rm -f ${pkgdir}/usr/lib/php/modules/*.a + # remove modules provided by sub packages + rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so + # remove empty directory + rmdir ${pkgdir}/usr/include/php/include +} + +package_php-cgi() { + pkgdesc='CGI and FCGI SAPI for PHP' + depends=('php') + + install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi +} + +package_php-apache() { + pkgdesc='Apache SAPI for PHP' + depends=('php' 'apache') + backup=('etc/httpd/conf/extra/php5_module.conf') + + install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so + install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf +} + +package_php-fpm() { + pkgdesc='FastCGI Process Manager for PHP' + depends=('php') + backup=('etc/php/php-fpm.conf') + + install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8 + install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf + install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm + install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm + install -d -m755 ${pkgdir}/etc/php/fpm.d +} + +package_php-embed() { + pkgdesc='Embed SAPI for PHP' + depends=('php') + + install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h +} + +package_php-pear() { + pkgdesc='PHP Extension and Application Repository' + depends=('php') + backup=('etc/php/pear.conf') + + cd ${srcdir}/build-pear + make -j1 install-pear INSTALL_ROOT=${pkgdir} + local i + while read i; do + [ ! -e "$i" ] || rm -rf "$i" + done < <(find ${pkgdir} -name '.*') +} + +package_php-enchant() { + depends=('php' 'enchant') + pkgdesc='enchant module for PHP' + install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so +} + +package_php-gd() { + depends=('php' 'libpng' 'libjpeg' 'freetype2') + pkgdesc='gd module for PHP' + install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so +} + +package_php-intl() { + depends=('php' 'icu') + pkgdesc='intl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so +} + +package_php-ldap() { + depends=('php' 'libldap') + pkgdesc='ldap module for PHP' + install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so +} + +package_php-mcrypt() { + depends=('php' 'libmcrypt' 'libltdl') + pkgdesc='mcrypt module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so +} + +package_php-mssql() { + depends=('php' 'freetds') + pkgdesc='mssql module for PHP' + install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so +} + +package_php-odbc() { + depends=('php' 'unixodbc') + pkgdesc='ODBC modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so + install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so +} + +package_php-pgsql() { + depends=('php' 'postgresql-libs') + pkgdesc='PostgreSQL modules for PHP' + install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so + install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so +} + +package_php-pspell() { + depends=('php' 'aspell') + pkgdesc='pspell module for PHP' + install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so +} + +package_php-snmp() { + depends=('php' 'net-snmp') + pkgdesc='snmp module for PHP' + install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so +} + +package_php-sqlite() { + depends=('php' 'sqlite3') + pkgdesc='sqlite3 module for PHP' + install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so + install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so +} + +package_php-tidy() { + depends=('php' 'tidyhtml') + pkgdesc='tidy module for PHP' + install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so +} + +package_php-xsl() { + depends=('php' 'libxslt') + pkgdesc='xsl module for PHP' + install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so +} diff --git a/staging/php/apache.conf b/staging/php/apache.conf new file mode 100644 index 000000000..c3ca0aad5 --- /dev/null +++ b/staging/php/apache.conf @@ -0,0 +1,13 @@ +# Required modules: dir_module, php5_module + + + + DirectoryIndex index.php index.html + + SetHandler application/x-httpd-php + + + SetHandler application/x-httpd-php-source + + + diff --git a/staging/php/logrotate.d.php-fpm b/staging/php/logrotate.d.php-fpm new file mode 100644 index 000000000..7a1ba2597 --- /dev/null +++ b/staging/php/logrotate.d.php-fpm @@ -0,0 +1,6 @@ +/var/log/php-fpm.log { + missingok + postrotate + /etc/rc.d/php-fpm logrotate >/dev/null || true + endscript +} diff --git a/staging/php/pcre_info.patch b/staging/php/pcre_info.patch new file mode 100644 index 000000000..e6d10df06 --- /dev/null +++ b/staging/php/pcre_info.patch @@ -0,0 +1,43 @@ +--- php-5.3.10/ext/pcre/php_pcre.c 2012-01-01 14:15:04.000000000 +0100 ++++ php-5.3.10/ext/pcre/php_pcre.c 2012-02-06 13:31:36.198935107 +0100 +@@ -241,6 +241,7 @@ + char *pattern; + int do_study = 0; + int poptions = 0; ++ int count = 0; + unsigned const char *tables = NULL; + #if HAVE_SETLOCALE + char *locale = setlocale(LC_CTYPE, NULL); +@@ -252,10 +252,10 @@ + back the compiled pattern, otherwise go on and compile it. */ + if (zend_hash_find(&PCRE_G(pcre_cache), regex, regex_len+1, (void **)&pce) == SUCCESS) { + /* +- * We use a quick pcre_info() check to see whether cache is corrupted, and if it ++ * We use a quick pcre_fullinfo() check to see whether cache is corrupted, and if it + * is, we flush it and compile the pattern from scratch. + */ +- if (pcre_info(pce->re, NULL, NULL) == PCRE_ERROR_BADMAGIC) { ++ if (pcre_fullinfo(pce->re, NULL, PCRE_INFO_CAPTURECOUNT, &count) == PCRE_ERROR_BADMAGIC) { + zend_hash_clean(&PCRE_G(pcre_cache)); + } else { + #if HAVE_SETLOCALE +--- php-5.3.10/ext/pcre/php_pcre.def 2009-01-11 14:59:00.000000000 +0100 ++++ php-5.3.10/ext/pcre/php_pcre.def 2012-02-06 13:31:47.775299315 +0100 +@@ -4,7 +4,6 @@ + php_pcre_exec + php_pcre_get_substring + php_pcre_get_substring_list +-php_pcre_info + php_pcre_maketables + php_pcre_study + php_pcre_version +--- php-5.3.10/main/php_compat.h 2012-01-01 14:15:04.000000000 +0100 ++++ php-5.3.10/main/php_compat.h 2012-02-06 13:26:59.272834580 +0100 +@@ -34,7 +34,6 @@ + #define pcre_exec php_pcre_exec + #define pcre_get_substring php_pcre_get_substring + #define pcre_get_substring_list php_pcre_get_substring_list +-#define pcre_info php_pcre_info + #define pcre_maketables php_pcre_maketables + #define pcre_study php_pcre_study + #define pcre_version php_pcre_version diff --git a/staging/php/php-fpm.conf.in.patch b/staging/php/php-fpm.conf.in.patch new file mode 100644 index 000000000..b923edb38 --- /dev/null +++ b/staging/php/php-fpm.conf.in.patch @@ -0,0 +1,52 @@ +--- sapi/fpm/php-fpm.conf.in 2011-10-08 23:04:10.000000000 +0200 ++++ sapi/fpm/php-fpm.conf.in 2012-01-11 10:50:14.905161442 +0100 +@@ -12,7 +12,7 @@ + ; Relative path can also be used. They will be prefixed by: + ; - the global prefix if it's been set (-p arguement) + ; - @prefix@ otherwise +-;include=etc/fpm.d/*.conf ++;include=/etc/php/fpm.d/*.conf + + ;;;;;;;;;;;;;;;;;; + ; Global Options ; +@@ -22,7 +22,7 @@ + ; Pid file + ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@ + ; Default Value: none +-;pid = run/php-fpm.pid ++pid = run/php-fpm/php-fpm.pid + + ; Error log file + ; If it's set to "syslog", log is sent to syslogd instead of being written +@@ -140,7 +140,8 @@ + ; specific port; + ; '/path/to/unix/socket' - to listen on a unix socket. + ; Note: This value is mandatory. +-listen = 127.0.0.1:9000 ++;listen = 127.0.0.1:9000 ++listen = /var/run/php-fpm/php-fpm.sock + + ; Set listen(2) backlog. A value of '-1' means unlimited. + ; Default Value: 128 (-1 on FreeBSD and OpenBSD) +@@ -151,9 +152,9 @@ + ; BSD-derived systems allow connections regardless of permissions. + ; Default Values: user and group are set as the running user + ; mode is set to 0666 +-;listen.owner = @php_fpm_user@ +-;listen.group = @php_fpm_group@ +-;listen.mode = 0666 ++listen.owner = @php_fpm_user@ ++listen.group = @php_fpm_group@ ++listen.mode = 0660 + + ; List of ipv4 addresses of FastCGI clients which are allowed to connect. + ; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original +@@ -442,7 +443,7 @@ + ; Chdir to this directory at the start. + ; Note: relative path can be used. + ; Default Value: current directory or / when chroot +-;chdir = /var/www ++;chdir = /srv/http + + ; Redirect worker stdout and stderr into main error log. If not set, stdout and + ; stderr will be redirected to /dev/null according to FastCGI specs. diff --git a/staging/php/php.ini.patch b/staging/php/php.ini.patch new file mode 100644 index 000000000..3dc5b6560 --- /dev/null +++ b/staging/php/php.ini.patch @@ -0,0 +1,126 @@ +--- php.ini-production 2011-12-15 11:31:02.000000000 +0100 ++++ php.ini-production 2012-01-11 10:43:02.069936043 +0100 +@@ -376,7 +376,7 @@ + ; or per-virtualhost web server configuration file. This directive is + ; *NOT* affected by whether Safe Mode is turned On or Off. + ; http://php.net/open-basedir +-;open_basedir = ++open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/ + + ; This directive allows you to disable certain functions for security reasons. + ; It receives a comma-delimited list of function names. This directive is +@@ -793,7 +793,7 @@ + ;;;;;;;;;;;;;;;;;;;;;;;;; + + ; UNIX: "/path1:/path2" +-;include_path = ".:/php/includes" ++include_path = ".:/usr/share/pear" + ; + ; Windows: "\path1;\path2" + ;include_path = ".;c:\php\includes" +@@ -816,7 +816,7 @@ + + ; Directory in which the loadable extensions (modules) reside. + ; http://php.net/extension-dir +-; extension_dir = "./" ++extension_dir = "/usr/lib/php/modules/" + ; On windows: + ; extension_dir = "ext" + +@@ -950,53 +950,49 @@ + ; If you only provide the name of the extension, PHP will look for it in its + ; default extension directory. + ; +-; Windows Extensions +-; Note that ODBC support is built in, so no dll is needed for it. +-; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) +-; extension folders as well as the separate PECL DLL download (PHP 5). +-; Be sure to appropriately set the extension_dir directive. +-; +-;extension=php_bz2.dll +-;extension=php_curl.dll +-;extension=php_fileinfo.dll +-;extension=php_gd2.dll +-;extension=php_gettext.dll +-;extension=php_gmp.dll +-;extension=php_intl.dll +-;extension=php_imap.dll +-;extension=php_interbase.dll +-;extension=php_ldap.dll +-;extension=php_mbstring.dll +-;extension=php_exif.dll ; Must be after mbstring as it depends on it +-;extension=php_mysql.dll +-;extension=php_mysqli.dll +-;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client +-;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client +-;extension=php_openssl.dll +-;extension=php_pdo_firebird.dll +-;extension=php_pdo_mssql.dll +-;extension=php_pdo_mysql.dll +-;extension=php_pdo_oci.dll +-;extension=php_pdo_odbc.dll +-;extension=php_pdo_pgsql.dll +-;extension=php_pdo_sqlite.dll +-;extension=php_pgsql.dll +-;extension=php_pspell.dll +-;extension=php_shmop.dll +- +-; The MIBS data available in the PHP distribution must be installed. +-; See http://www.php.net/manual/en/snmp.installation.php +-;extension=php_snmp.dll +- +-;extension=php_soap.dll +-;extension=php_sockets.dll +-;extension=php_sqlite.dll +-;extension=php_sqlite3.dll +-;extension=php_sybase_ct.dll +-;extension=php_tidy.dll +-;extension=php_xmlrpc.dll +-;extension=php_xsl.dll +-;extension=php_zip.dll ++;extension=bcmath.so ++;extension=bz2.so ++;extension=calendar.so ++extension=curl.so ++;extension=dba.so ++;extension=enchant.so ++;extension=exif.so ++;extension=ftp.so ++;extension=gd.so ++extension=gettext.so ++;extension=gmp.so ++;extension=iconv.so ++;extension=imap.so ++;extension=intl.so ++extension=json.so ++;extension=ldap.so ++;extension=mcrypt.so ++;extension=mssql.so ++;extension=mysqli.so ++;extension=mysql.so ++;extension=odbc.so ++;extension=openssl.so ++;extension=pdo_mysql.so ++;extension=pdo_odbc.so ++;extension=pdo_pgsql.so ++;extension=pdo_sqlite.so ++;extension=pgsql.so ++;extension=phar.so ++;extension=posix.so ++;extension=pspell.so ++;extension=shmop.so ++;extension=snmp.so ++;extension=soap.so ++;extension=sockets.so ++;extension=sqlite3.so ++;extension=sqlite.so ++;extension=sysvmsg.so ++;extension=sysvsem.so ++;extension=sysvshm.so ++;extension=tidy.so ++;extension=xmlrpc.so ++;extension=xsl.so ++;extension=zip.so + + ;;;;;;;;;;;;;;;;;;; + ; Module Settings ; diff --git a/staging/php/rc.d.php-fpm b/staging/php/rc.d.php-fpm new file mode 100644 index 000000000..54bcf4d5b --- /dev/null +++ b/staging/php/rc.d.php-fpm @@ -0,0 +1,158 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + + +wait_for_pid () { + try=0 + while test $try -lt 35 ; do + case "$1" in + 'created') + if [ -f "$2" ] ; then + try='' + break + fi + ;; + 'removed') + if [ ! -f "$2" ] ; then + try='' + break + fi + ;; + esac + + stat_append '.' + try=`expr $try + 1` + sleep 1 + done +} + +test_config() { + stat_busy 'Checking configuration' + if [ $(id -u) -ne 0 ]; then + stat_append '(This script must be run as root)' + stat_die + fi + + if [ ! -r /etc/php/php-fpm.conf ]; then + stat_append '(/etc/php/php-fpm.conf not found)' + stat_die + fi + + local test=$(/usr/sbin/php-fpm -t 2>&1) + if [ $? -gt 0 ]; then + stat_append '(error in /etc/php/php-fpm.conf)' + stat_die + elif echo $test | grep -qi 'error'; then + stat_append '(error in /etc/php/php.ini)' + stat_die + fi + + [ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm + + stat_done +} + +case "$1" in + start) + test_config + stat_busy 'Starting php-fpm' + + /usr/sbin/php-fpm + + if [ "$?" != 0 ] ; then + stat_fail + exit 1 + fi + + wait_for_pid created /var/run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + add_daemon php-fpm + stat_done + fi + ;; + + stop) + test_config + stat_busy 'Gracefully shutting down php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -QUIT `cat /var/run/php-fpm/php-fpm.pid` + + wait_for_pid removed /var/run/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + force-quit) + stat_busy 'Terminating php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -TERM `cat /var/run/php-fpm/php-fpm.pid` + + wait_for_pid removed /var/run/php-fpm/php-fpm.pid + + if [ -n "$try" ] ; then + stat_fail + exit 1 + else + rm_daemon php-fpm + stat_done + fi + ;; + + restart) + $0 stop + $0 start + ;; + + reload) + test_config + stat_busy 'Reload service php-fpm' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR2 `cat /var/run/php-fpm/php-fpm.pid` + stat_done + ;; + + logrotate) + stat_busy 'Reopen php-fpm log' + + if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then + stat_fail + exit 1 + fi + + kill -USR1 `cat /var/run/php-fpm/php-fpm.pid` + stat_done + ;; + + *) + echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}" + exit 1 + ;; + +esac diff --git a/testing/anjuta-extras/PKGBUILD b/testing/anjuta-extras/PKGBUILD new file mode 100644 index 000000000..8996ddc61 --- /dev/null +++ b/testing/anjuta-extras/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 155009 2012-04-01 11:30:33Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=anjuta-extras +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Anjuta Integrated Development Environment extra plugins" +arch=('i686' 'x86_64') +license=('GPL') +depends=('anjuta') +makedepends=('intltool' 'gnome-doc-utils') +install=anjuta-extras.install +url="http://anjuta.sourceforge.net/" +source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +options=('!libtool' '!emptydirs') +sha256sums=('e9aa21dfa7e182c85e15eb4c3f1d0db928826572350f0aaeeae8ee9c947440bd') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/anjuta-extras/anjuta-extras.install b/testing/anjuta-extras/anjuta-extras.install new file mode 100644 index 000000000..a96048c1d --- /dev/null +++ b/testing/anjuta-extras/anjuta-extras.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/anjuta/PKGBUILD b/testing/anjuta/PKGBUILD new file mode 100644 index 000000000..04d037a42 --- /dev/null +++ b/testing/anjuta/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 155007 2012-04-01 11:30:31Z heftig $ +# Maintainer: Andreas Radke +# Contributor: Harley Laue + +pkgname=anjuta +pkgver=3.4.0 +pkgrel=2 +pkgdesc="GNOME Integrated Development Environment (IDE)" +arch=('i686' 'x86_64') +license=('GPL') +depends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf') +makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') +url="http://anjuta.sourceforge.net/" +install=anjuta.install +source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +options=('!libtool' '!emptydirs') +sha256sums=('c8175e04e797dc0e2aaede4ae73ee9cd7f37d3e59b158961703db546d4660abf') + +build() { + cd "$srcdir/$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-scrollkeeper + make +} + +package(){ + cd "$srcdir/$pkgname-$pkgver" + + # j1: Race during linking + make -j1 DESTDIR="$pkgdir" install + + sed -i "1s|#!/usr/bin/python$|&2|" \ + $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py +} diff --git a/testing/anjuta/anjuta.install b/testing/anjuta/anjuta.install new file mode 100644 index 000000000..59113c6f5 --- /dev/null +++ b/testing/anjuta/anjuta.install @@ -0,0 +1,21 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + gtk-update-icon-cache -q -t -f /usr/share/icons/gnome + update-mime-database /usr/share/mime > /dev/null +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall anjuta + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/at-spi2-atk/PKGBUILD b/testing/at-spi2-atk/PKGBUILD new file mode 100644 index 000000000..d0003a00e --- /dev/null +++ b/testing/at-spi2-atk/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 155013 2012-04-01 11:30:38Z heftig $ +# Maintainer: Ionut Biru + +pkgname=at-spi2-atk +pkgver=2.4.0 +pkgrel=1 +pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" +arch=('i686' 'x86_64') +url="http://www.gnome.org" +license=('GPL2') +depends=('at-spi2-core' 'libx11' 'atk' 'dconf') +makedepends=('intltool') +install=at-spi2-atk.install +options=('!libtool') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('28e9c21ec8a76cae4914bdbc011c4f6bf1beeaa27751a88534d87364e6a888bf') + +build() { + cd $pkgname-$pkgver + + sed -i -e '/AC_PATH_XTRA/d' configure.ac + autoreconf --force --install + + ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/at-spi2-atk/at-spi2-atk.install b/testing/at-spi2-atk/at-spi2-atk.install new file mode 100644 index 000000000..2ef26aaa9 --- /dev/null +++ b/testing/at-spi2-atk/at-spi2-atk.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/at-spi2-core/PKGBUILD b/testing/at-spi2-core/PKGBUILD new file mode 100644 index 000000000..db5013e39 --- /dev/null +++ b/testing/at-spi2-core/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 155015 2012-04-01 11:30:41Z heftig $ +# Maintainer: Ionut Biru + +pkgname=at-spi2-core +pkgver=2.4.0 +pkgrel=1 +pkgdesc="Protocol definitions and daemon for D-Bus at-spi" +arch=('i686' 'x86_64') +url="http://www.gnome.org" +license=('GPL2') +depends=('dbus-core' 'glib2' 'libxtst') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('d9d087efe528b392cb7ee27982798126df6ec8c18d5e30c557c8fcc55022c669') + +build() { + cd $pkgname-$pkgver + + sed -i -e '/AC_PATH_XTRA/d' configure.ac + autoreconf --force --install + + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/at-spi2-core --disable-xevie + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/atk/PKGBUILD b/testing/atk/PKGBUILD new file mode 100644 index 000000000..72d716a99 --- /dev/null +++ b/testing/atk/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 155011 2012-04-01 11:30:36Z heftig $ +# Maintainer: Jan de Groot + +pkgname=atk +pkgver=2.4.0 +pkgrel=1 +pkgdesc="A library providing a set of interfaces for accessibility" +arch=(i686 x86_64) +license=('LGPL') +depends=('glib2') +makedepends=('gobject-introspection') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +url='http://www.gtk.org/' +sha256sums=('091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/baobab/PKGBUILD b/testing/baobab/PKGBUILD new file mode 100644 index 000000000..3b1f589fd --- /dev/null +++ b/testing/baobab/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 155017 2012-04-01 11:30:45Z heftig $ +# Maintainer: Ionut Biru +pkgname=baobab +pkgver=3.4.0 +pkgrel=1 +pkgdesc="A graphical directory tree analyzer" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('dconf' 'gtk3' 'libgtop') +makedepends=('intltool' 'itstool') +groups=('gnome-extra') +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('0936bb2e1bb9a9a7518eaa2a29cffd0bd9b99ae9c33e4e99b5d11c6d150a08bd') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/baobab/baobab.install b/testing/baobab/baobab.install new file mode 100644 index 000000000..847019792 --- /dev/null +++ b/testing/baobab/baobab.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/bluez/PKGBUILD b/testing/bluez/PKGBUILD index 7d3835488..f39627378 100644 --- a/testing/bluez/PKGBUILD +++ b/testing/bluez/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 152440 2012-03-06 23:09:43Z tomegun $ +# $Id: PKGBUILD 155321 2012-04-01 19:52:58Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Andrea Scarpino # Contributor: Geoffroy Carrier pkgname=bluez pkgver=4.99 -pkgrel=1 +pkgrel=2 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64') @@ -77,7 +77,7 @@ package() { "${pkgdir}"/usr/bin/bluez-test-input # http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html - rm "${pkgdir}"/lib/udev/rules.d/97-bluetooth.rules + rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules } md5sums=('2387053eb5a7b02f37df4871df022a02' '7412982b440f29fa7f76a41a87fef985' diff --git a/testing/brasero/PKGBUILD b/testing/brasero/PKGBUILD new file mode 100644 index 000000000..3762b7cd9 --- /dev/null +++ b/testing/brasero/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 155019 2012-04-01 11:30:47Z heftig $ +# Maintainer: Allan McRae +# Maintainer: Jan de Groot +# Contributor: William Rea + +pkgname=brasero +pkgver=3.4.0 +pkgrel=1 +pkgdesc="A disc burning application for Gnome" +arch=('i686' 'x86_64') +url="http://www.gnome.org/projects/brasero" +license=('GPL') +options=('!libtool' '!emptydirs') +depends=('gtk3' 'gstreamer0.10-base-plugins' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info' 'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql') +makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' 'gobject-introspection' 'gconf') +optdepends=('libburn: alternative back-end' + 'libisofs: libburn back-end' + 'dvdauthor: video project' + 'gstreamer0.10-bad-plugins: video project' + 'vcdimager: video project') +replaces=('nautilus-cd-burner') +install=brasero.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('e35b739a7db54d21564232303bb9d12609a02976c36cdd8848ff4376a0809198') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-caches \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR=$pkgdir install +} + diff --git a/testing/brasero/brasero.install b/testing/brasero/brasero.install new file mode 100644 index 000000000..b6c57055e --- /dev/null +++ b/testing/brasero/brasero.install @@ -0,0 +1,14 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/cairo/PKGBUILD b/testing/cairo/PKGBUILD index 3f3f3e8ae..2346fdfac 100644 --- a/testing/cairo/PKGBUILD +++ b/testing/cairo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 154931 2012-03-31 09:15:49Z andyrtr $ +# $Id: PKGBUILD 155307 2012-04-01 15:13:03Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Brice Carpentier pkgname=cairo pkgver=1.12.0 -pkgrel=1 +pkgrel=2 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64) license=('LGPL' 'MPL') @@ -28,7 +28,7 @@ build() { --localstatedir=/var \ --disable-static \ --enable-tee \ - --enable-xlib-xcb \ + --disable-xlib-xcb \ # --enable-test-surfaces \ takes ages #--enable-drm # breaks build make diff --git a/testing/caribou/PKGBUILD b/testing/caribou/PKGBUILD new file mode 100644 index 000000000..4a23ede0b --- /dev/null +++ b/testing/caribou/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 155022 2012-04-01 11:30:52Z heftig $ +# Maintainer : Ionut Biru +# Contributor: Adam Hani Schakaki + +pkgname=caribou +pkgver=0.4.2 +pkgrel=1 +pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard." +arch=('i686' 'x86_64') +url="http://live.gnome.org/Caribou" +license=('LGPL') +depends=('at-spi2-atk' 'pyatspi' 'dbus-python' 'python2-gobject' 'gtk3' 'libxklavier' 'libgee' 'clutter' 'dconf') +makedepends=('gnome-doc-utils' 'intltool') +install=caribou.install +options=(!libtool !emptydirs) +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz) +sha256sums=('bcc64498b20c368747c3630d501a66ccf904db15d855f33fd4f963b5b19723ad') + +build() { + cd $pkgname-$pkgver + sed -i s'|#!/usr/bin/python|#!/usr/bin/python2|'g tools/{fix_gir,make_schema}.py + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/caribou \ + --disable-gtk2-module \ + --disable-static \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/caribou/caribou.install b/testing/caribou/caribou.install new file mode 100644 index 000000000..22ca274a5 --- /dev/null +++ b/testing/caribou/caribou.install @@ -0,0 +1,13 @@ +pkgname=caribou + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + glib-compile-schemas usr/share/glib-2.0/schemas +} diff --git a/testing/cheese/PKGBUILD b/testing/cheese/PKGBUILD new file mode 100644 index 000000000..e1a699d80 --- /dev/null +++ b/testing/cheese/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 155024 2012-04-01 11:30:54Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=cheese +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" +arch=(i686 x86_64) +license=('GPL') +depends=('gnome-desktop' 'gtk3' 'libcanberra' 'librsvg' 'gstreamer0.10-base-plugins' + 'gstreamer0.10-good-plugins' 'gstreamer0.10-bad' 'clutter-gst' 'clutter-gtk' 'mx' 'libgee' + 'gnome-video-effects' 'hicolor-icon-theme' 'dconf' 'cogl') +makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool' + 'nautilus-sendto') +optdepends=('nautilus-sendto: Send images') +groups=('gnome-extra') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org/projects/cheese/" +install=cheese.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('96b0eae8e366e4d44921e148239167fcb6965dbbcb40e406d6a118c75377b41a') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/cheese/cheese.install b/testing/cheese/cheese.install new file mode 100644 index 000000000..c042fba42 --- /dev/null +++ b/testing/cheese/cheese.install @@ -0,0 +1,20 @@ +pkgname=cheese + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then + usr/sbin/gconfpkg --uninstall $pkgname + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/clutter-gst/PKGBUILD b/testing/clutter-gst/PKGBUILD new file mode 100644 index 000000000..2559c62a9 --- /dev/null +++ b/testing/clutter-gst/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 155028 2012-04-01 11:31:00Z heftig $ +# Maintainer: Jan "heftig" Steffens + +pkgname=clutter-gst +pkgver=1.5.4 +pkgrel=1 +pkgdesc="GStreamer bindings for clutter" +arch=('i686' 'x86_64') +url="http://www.clutter-project.org/" +license=('LGPL') +depends=('clutter' 'gstreamer0.10-base' 'libxdamage') +makedepends=('gobject-introspection') +options=('!libtool') +source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('a137313ad134cd3737c018cc8f725ed1a4d1cf7d276012d75467b55f1f9859d7') + +build() { + cd "$pkgname-$pkgver" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/clutter-gtk/PKGBUILD b/testing/clutter-gtk/PKGBUILD new file mode 100644 index 000000000..f7a745246 --- /dev/null +++ b/testing/clutter-gtk/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 155030 2012-04-01 11:31:03Z heftig $ +# Maintainer: Jan de Groot + +pkgname=clutter-gtk +pkgver=1.2.0 +pkgrel=1 +pkgdesc="GTK clutter widget" +arch=('i686' 'x86_64') +url="http://clutter-project.org/" +options=('!libtool') +license=('LGPL') +depends=('clutter' 'gtk3') +makedepends=('gobject-introspection') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('8be5deb0fa2f318e5f5e888b8ace3371c516464472a48f25c8b42ccc298af59a') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/clutter/PKGBUILD b/testing/clutter/PKGBUILD new file mode 100644 index 000000000..cae262bd6 --- /dev/null +++ b/testing/clutter/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 155026 2012-04-01 11:30:57Z heftig $ +# Maintainer: Jan de Groot +# Contributor: Sergej Pupykin +# Contributor: William Rea + +pkgname=clutter +pkgver=1.10.0 +pkgrel=1 +pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" +arch=('i686' 'x86_64') +url="http://clutter-project.org/" +options=('!libtool') +license=('LGPL') +depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi') +makedepends=('gobject-introspection' 'mesa') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('51659837c77009cd04d069e480e9131328d6557ad67d1ffdc0dc4ae65a73ee45') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --enable-introspection + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/cogl/PKGBUILD b/testing/cogl/PKGBUILD new file mode 100644 index 000000000..05ebe35b3 --- /dev/null +++ b/testing/cogl/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 155032 2012-04-01 11:31:05Z heftig $ +# Maintainer: Ionut Biru + +pkgname=cogl +pkgver=1.10.0 +pkgrel=1 +pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" +arch=('i686' 'x86_64') +url="http://www.clutter-project.org/" +license=('GPL2') +depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango') +makedepends=('mesa' 'gobject-introspection') +options=(!libtool !emptydirs) +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('544b648cd5dc0a0ea438acd89d83727d82d6c29927db33a519ce2b28dc1ad07d') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/colord/PKGBUILD b/testing/colord/PKGBUILD new file mode 100644 index 000000000..3fd33e988 --- /dev/null +++ b/testing/colord/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 155034 2012-04-01 11:31:08Z heftig $ +# Maintainer: Jan "heftig" Steffens +# Contributor: Ionut Biru + +pkgname=colord +pkgver=0.1.18 +pkgrel=1 +pkgdesc="Color daemon" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/software/colord" +license=('GPL2') +depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite3' 'udev') +makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') +source=($url/releases/$pkgname-$pkgver.tar.xz) +options=('!libtool') +sha1sums=('6127e723a9beb932aae7a43b6e6b5fdb84c39611') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --sysconfdir=/etc --libexecdir=/usr/lib/colord \ + --localstatedir=/var --disable-static \ + --with-systemdsystemunitdir=/lib/systemd/system + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/dconf/PKGBUILD b/testing/dconf/PKGBUILD new file mode 100644 index 000000000..211f647cd --- /dev/null +++ b/testing/dconf/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 155036 2012-04-01 11:31:10Z heftig $ +# Maintainer: Ionut Biru + +pkgname=dconf +pkgver=0.12.0 +pkgrel=1 +pkgdesc="A low-level configuration system." +arch=(i686 x86_64) +url="http://live.gnome.org/dconf" +license=('LGPL2.1') +depends=('glib2' 'gtk-update-icon-cache') +makedepends=('vala' 'gtk3') +optdepends=('gtk3: for dconf-editor') +install=dconf.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('9c020e2ff0adb19ff9bc3d73ce15388fb42c52b12ed751bdb59ce53a660461af') + +build() { + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/dconf + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/dconf/dconf.install b/testing/dconf/dconf.install new file mode 100644 index 000000000..75d713d64 --- /dev/null +++ b/testing/dconf/dconf.install @@ -0,0 +1,13 @@ +post_install() { + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade(){ + post_install +} + +post_remove() { + post_install +} diff --git a/testing/devhelp/PKGBUILD b/testing/devhelp/PKGBUILD new file mode 100644 index 000000000..edd413d73 --- /dev/null +++ b/testing/devhelp/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 155038 2012-04-01 11:31:13Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot +# Contributor: Link Dupont + +pkgname=devhelp +pkgver=3.4.0 +pkgrel=1 +pkgdesc="API documentation browser for GNOME" +arch=(i686 x86_64) +license=('GPL') +url="http://live.gnome.org/devhelp/" +depends=('gconf' 'libwebkit3' 'hicolor-icon-theme') +makedepends=('pkgconfig' 'intltool' 'python2') +options=('!libtool' '!emptydirs') +install=devhelp.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('de7466250a433877abf562815eb1cc8dd663d80ae65cdf796285c0c5b05144e8') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + 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 devhelp ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/testing/devhelp/devhelp.install b/testing/devhelp/devhelp.install new file mode 100644 index 000000000..4db5f6e5c --- /dev/null +++ b/testing/devhelp/devhelp.install @@ -0,0 +1,22 @@ +pkgname=devhelp + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD new file mode 100644 index 000000000..f66f56a28 --- /dev/null +++ b/testing/empathy/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 155040 2012-04-01 11:31:16Z heftig $ +# Maintainer: Ionut Biru + +pkgname=empathy +pkgver=3.4.0 +pkgrel=1 +pkgdesc="A GNOME instant messaging client using the Telepathy framework." +arch=('i686' 'x86_64') +url="http://live.gnome.org/Empathy" +license=('GPL2') +depends=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'libwebkit3' 'networkmanager' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control') +makedepends=('intltool' 'itstool') +optdepends=('telepathy-gabble: XMPP/Jabber support' + 'telepathy-idle: IRC support' + 'telepathy-salut: Link-local XMPP support' + 'telepathy-sofiasip: SIP support' + 'telepathy-haze: libpurple support') +options=('!libtool') +groups=('gnome-extra') +install=empathy.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('dd04344638a5496fd108c4d299a6f6d2272dc521dc353de85f13995f399f8f1a') + +build() { + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/empathy \ + --disable-static \ + --disable-schemas-compile + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/empathy/empathy.install b/testing/empathy/empathy.install new file mode 100644 index 000000000..f8d2dfb1f --- /dev/null +++ b/testing/empathy/empathy.install @@ -0,0 +1,16 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + echo "To use Empathy you need to install at least one Telepathy connection manager." +} + +post_upgrade() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_remove() { + post_upgrade +} diff --git a/testing/eog-plugins/PKGBUILD b/testing/eog-plugins/PKGBUILD new file mode 100644 index 000000000..b5c786a7f --- /dev/null +++ b/testing/eog-plugins/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 155044 2012-04-01 11:31:22Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=eog-plugins +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Plugins for Eye of Gnome" +arch=('i686' 'x86_64') +url="http://www.gnome.org/" +license=('GPL2') +depends=('eog' 'libchamplain' 'libgdata') +makedepends=('intltool') +install=eog-plugins.install +options=('!libtool') +groups=(gnome-extra) +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('21a63f8f6e3a5b30f2f05133edc46becd4c83343c0f462a345204326071bc139') + +build() { + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/eog-plugins/eog-plugins.install b/testing/eog-plugins/eog-plugins.install new file mode 100644 index 000000000..24072f316 --- /dev/null +++ b/testing/eog-plugins/eog-plugins.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/eog/PKGBUILD b/testing/eog/PKGBUILD new file mode 100644 index 000000000..0a99d9d00 --- /dev/null +++ b/testing/eog/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 155042 2012-04-01 11:31:19Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=eog +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Eye of Gnome: An image viewing and cataloging program" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gnome-desktop' 'libexif' 'lcms2' 'desktop-file-utils' 'exempi' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf') +makedepends=('gtk-doc' 'intltool') +install=eog.install +groups=('gnome-extra') +options=('!emptydirs' '!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('0710479642078aebb576d07ccc599e9f5ae83f4c738b182867fda59aea359dd2') + +build() { + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-scrollkeeper + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # remove it from Xfce menu that ships its own thingy + echo "NotShowIn=XFCE" >> $pkgdir/usr/share/applications/eog.desktop +} diff --git a/testing/eog/eog.install b/testing/eog/eog.install new file mode 100644 index 000000000..1571179ca --- /dev/null +++ b/testing/eog/eog.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/epiphany-extensions/PKGBUILD b/testing/epiphany-extensions/PKGBUILD new file mode 100644 index 000000000..bf3a79268 --- /dev/null +++ b/testing/epiphany-extensions/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 155048 2012-04-01 11:31:28Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=epiphany-extensions +pkgver=3.4.0 +pkgrel=1 +url="http://www.gnome.org/projects/epiphany/" +pkgdesc="Various extentions for the Epiphany web browser" +arch=('i686' 'x86_64') +license=('GPL') +depends=('epiphany' 'opensp' 'hicolor-icon-theme') +makedepends=('gnome-doc-utils' 'intltool' 'gnome-common') +options=('!libtool' '!emptydirs') +install=epiphany-extensions.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('eaf1b466e316f4d6ed35437f8fdd4723a61ae57dd2744751e99109fd581f8fa5') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/epiphany-extensions/epiphany-extensions.install b/testing/epiphany-extensions/epiphany-extensions.install new file mode 100644 index 000000000..c0ed9a0d7 --- /dev/null +++ b/testing/epiphany-extensions/epiphany-extensions.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/epiphany/PKGBUILD b/testing/epiphany/PKGBUILD new file mode 100644 index 000000000..e56a622a8 --- /dev/null +++ b/testing/epiphany/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 155046 2012-04-01 11:31:25Z heftig $ +# Maintainer: Jan de Groot + +pkgname=epiphany +pkgver=3.4.0.1 +pkgrel=1 +install=epiphany.install +pkgdesc="A GNOME web browser based on the WebKit rendering engine." +arch=('i686' 'x86_64') +license=('GPL') +depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'libwebkit3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils' + 'hicolor-icon-theme' 'seed') +makedepends=('intltool' 'gnome-doc-utils' 'startup-notification') +options=('!libtool' '!emptydirs') +groups=('gnome') +url="http://www.gnome.org/projects/epiphany/" +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('48acfa6efc806cc6b02f783dd92b36ba3bdf94d1e1ae02bed69886f45e400533') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-scrollkeeper \ + --enable-seed + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/epiphany/epiphany.install b/testing/epiphany/epiphany.install new file mode 100644 index 000000000..8b17fa3d4 --- /dev/null +++ b/testing/epiphany/epiphany.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/evince/PKGBUILD b/testing/evince/PKGBUILD new file mode 100644 index 000000000..9f14a843c --- /dev/null +++ b/testing/evince/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 155050 2012-04-01 11:31:31Z heftig $ +# Maintainer: Jan de Groot + +pkgname=evince +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Simply a document viewer" +url="http://projects.gnome.org/evince/" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk3' 'libgxps' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') +makedepends=('gnome-doc-utils' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection') +optdepends=('texlive-bin: DVI support') +groups=('gnome-extra') +install=evince.install +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('02f1c74c123ea0cb4c1a98cb9ba2b67d724e9f90d7ff15acbcd6b8dbeef0a129') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/evince \ + --disable-static --enable-nautilus \ + --enable-pdf --enable-tiff \ + --enable-djvu --enable-dvi \ + --enable-t1lib --enable-comics \ + --disable-scrollkeeper --disable-schemas-compile \ + --enable-introspection + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/evince/evince.install b/testing/evince/evince.install new file mode 100644 index 000000000..1571179ca --- /dev/null +++ b/testing/evince/evince.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/evolution-data-server/PKGBUILD b/testing/evolution-data-server/PKGBUILD new file mode 100644 index 000000000..ae9aa86fa --- /dev/null +++ b/testing/evolution-data-server/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 155054 2012-04-01 11:31:38Z heftig $ +# Maintainer: Jan de Groot + +pkgname=evolution-data-server +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Centralized access to appointments and contacts" +arch=('i686' 'x86_64') +depends=('gconf' 'gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata') +makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala') +options=('!libtool') +install=$pkgname.install +url="http://www.gnome.org" +license=('GPL') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('7132aee89b73187155c8afec43b9b3cc5c97098a488aad3872f7fedd0552a6ac') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --with-openldap=yes \ + --libexecdir=/usr/lib/evolution-data-server \ + --with-krb5=/usr --with-libdb=/usr \ + --enable-vala-bindings \ + --disable-schemas-install + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/evolution-data-server/evolution-data-server.install b/testing/evolution-data-server/evolution-data-server.install new file mode 100644 index 000000000..29a359805 --- /dev/null +++ b/testing/evolution-data-server/evolution-data-server.install @@ -0,0 +1,11 @@ +post_install () { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade () { + post_install +} + +post_remove () { + post_install +} diff --git a/testing/evolution-ews/PKGBUILD b/testing/evolution-ews/PKGBUILD new file mode 100644 index 000000000..425f57589 --- /dev/null +++ b/testing/evolution-ews/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 155056 2012-04-01 11:31:41Z heftig $ +# Maintainer: Ionut Biru + +pkgname=evolution-ews +pkgver=3.4.0 +pkgrel=1 +pkgdesc="MS Exchange integration through Exchange Web Services" +arch=('i686' 'x86_64') +license=('LGPL2.1') +url="http://www.gnome.org" +depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') +makedepends=('intltool' 'evolution') +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('2bc20f65fc645f0a76d218d483650f9c9cc75ce3104ad849af6e7eec2d5a7f72') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/evolution --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/evolution-exchange/PKGBUILD b/testing/evolution-exchange/PKGBUILD new file mode 100644 index 000000000..be8faa3a0 --- /dev/null +++ b/testing/evolution-exchange/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 155058 2012-04-01 11:31:45Z heftig $ +# Maintainer: Jan de Groot + +pkgname=evolution-exchange +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Ximian Connector Exchange plugin for Evolution" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.ximian.com" +depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop') +makedepends=('intltool' 'evolution') +options=('!libtool' '!emptydirs') +install=evolution-exchange.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('7bfdf2fb44e691e7eb611aa0d1129cbacf43f7a2477fdae87f06368eecc89fb4') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/evolution --disable-static \ + --with-libdb=/usr --with-krb5=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-exchange-3.2 "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f $pkgdir/etc/gconf/schemas/*.schemas +} diff --git a/testing/evolution-exchange/evolution-exchange.install b/testing/evolution-exchange/evolution-exchange.install new file mode 100644 index 000000000..1179887f9 --- /dev/null +++ b/testing/evolution-exchange/evolution-exchange.install @@ -0,0 +1,17 @@ +pkgname=evolution-exchange + +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/testing/evolution-groupwise/PKGBUILD b/testing/evolution-groupwise/PKGBUILD new file mode 100644 index 000000000..154a0693c --- /dev/null +++ b/testing/evolution-groupwise/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 155060 2012-04-01 11:31:47Z heftig $ +# Maintainer : Ionut Biru +# Contributor: György Balló + +pkgname=evolution-groupwise +pkgver=3.4.0 +pkgrel=1 +pkgdesc="GroupWise connector for evolution" +arch=(i686 x86_64) +url="http://projects.gnome.org/evolution/" +license=(LGPL) +depends=('evolution-data-server' 'gtkhtml4') +makedepends=(intltool evolution) +optdepends=('evolution: evolution plugin') +options=(!libtool) +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('b5e882811d10411249accb4ce1131d2e2d336d357b68a8f5dcfe7576b320c717') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd $pkgname-$pkgver + + make DESTDIR="$pkgdir" install +} + diff --git a/testing/evolution/PKGBUILD b/testing/evolution/PKGBUILD new file mode 100644 index 000000000..99a303c6e --- /dev/null +++ b/testing/evolution/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 155052 2012-04-01 11:31:35Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=evolution +pkgver=3.4.0.1 +pkgrel=1 +pkgdesc="Manage your email, contacts and schedule" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf') +makedepends=('intltool' 'gnome-doc-utils' 'networkmanager') +optdepends=('bogofilter: possible junk filter plugin' + 'spamassassin: possible junk filter plugin') +groups=('gnome-extra') +options=('!libtool' '!emptydirs') +install=evolution.install +url=http://www.gnome.org/projects/evolution/ +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('364eacfc54912ba26738729d0f662a821140a712e3607cf569eb342f1dab4f7a') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib \ + --enable-nss=yes \ + --with-openldap=yes \ + --enable-smime=yes \ + --with-krb5=/usr \ + --disable-image-inline + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make + make -C plugins/tnef-attachments +} + +package() { + cd $pkgname-$pkgver + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install + make -C plugins/tnef-attachments DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain evolution-3.2 "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas +} diff --git a/testing/evolution/evolution.install b/testing/evolution/evolution.install new file mode 100644 index 000000000..500c5e2da --- /dev/null +++ b/testing/evolution/evolution.install @@ -0,0 +1,24 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gconfpkg --install evolution + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + gconfpkg --uninstall evolution +} + +post_remove() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} diff --git a/testing/farstream/PKGBUILD b/testing/farstream/PKGBUILD new file mode 100644 index 000000000..00bc4f544 --- /dev/null +++ b/testing/farstream/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 155062 2012-04-01 11:31:50Z heftig $ +# Maintainer: Ionut Biru + +pkgname=farstream +pkgver=0.1.2 +pkgrel=1 +pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework" +arch=(i686 x86_64) +url="http://www.freedesktop.org/wiki/Software/Farstream" +license=('LGPL2.1') +depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-good' 'gstreamer0.10-ffmpeg') +makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2') +conflicts=('farsight2') +replaces=('farsight2') +options=(!libtool) +source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz + vp8.patch) +md5sums=('5d6e561b3688d0d0c8906fec4f356df3' + 'c4e76d03d678d29b872b610f9cff42cd') + +build() { + cd "$pkgname-$pkgver" + patch -Np1 -i "$srcdir/vp8.patch" + ./configure --prefix=/usr \ + --with-package-name='Arch Linux farstream package' \ + --with-package-origin='http://archlinux.org' \ + --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/farstream/vp8.patch b/testing/farstream/vp8.patch new file mode 100644 index 000000000..67009a8ad --- /dev/null +++ b/testing/farstream/vp8.patch @@ -0,0 +1,12 @@ +diff -urNp farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences farstream-0.1.1/gst/fsrtpconference/default-codec-preferences +--- farstream-0.1.1.orig/gst/fsrtpconference/default-codec-preferences 2012-03-20 12:12:22.644324485 +0100 ++++ farstream-0.1.1/gst/fsrtpconference/default-codec-preferences 2012-03-21 09:32:04.468634455 +0100 +@@ -41,6 +41,8 @@ feedback:nack/pli= + [video/H263] + feedback:nack/pli= + ++[video/VP8-DRAFT-IETF-01] ++ + [video/THEORA] + #feedback:tfrc= + feedback:nack/pli= diff --git a/testing/folks/PKGBUILD b/testing/folks/PKGBUILD new file mode 100644 index 000000000..5965e549d --- /dev/null +++ b/testing/folks/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 155066 2012-04-01 11:31:56Z heftig $ +# Maintainer: Ionut Biru + +pkgname=folks +pkgver=0.6.8 +pkgrel=1 +pkgdesc="Library to aggregates people into metacontacts" +arch=(i686 x86_64) +url="http://telepathy.freedesktop.org/wiki/Folks" +license=('LGPL2.1') +depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb') +makedepends=('gobject-introspection' 'intltool') +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz) +sha256sums=('4ee18ce808315f27ab6bf9f7d2b438dd4c1042a8ab6836bb5058b6dce167e0b1') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/gcalctool/PKGBUILD b/testing/gcalctool/PKGBUILD new file mode 100644 index 000000000..dcd831257 --- /dev/null +++ b/testing/gcalctool/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 155068 2012-04-01 11:32:00Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=gcalctool +pkgver=6.4.0 +pkgrel=1 +pkgdesc="GNOME Scientific calculator" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk3' 'dconf') +makedepends=('intltool' 'yelp-tools') +groups=('gnome-extra') +options=(!emptydirs) +url="http://www.gnome.org" +install=gcalctool.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('cfc30d6002dc9c04598a17f729b60f2d6d37a500e88f10905c817da739fa2a85') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile \ + --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/testing/gcalctool/gcalctool.install b/testing/gcalctool/gcalctool.install new file mode 100644 index 000000000..2ef26aaa9 --- /dev/null +++ b/testing/gcalctool/gcalctool.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/gconf/01_xml-gettext-domain.patch b/testing/gconf/01_xml-gettext-domain.patch new file mode 100644 index 000000000..d1323f61f --- /dev/null +++ b/testing/gconf/01_xml-gettext-domain.patch @@ -0,0 +1,362 @@ +# Description: Support calling gettext at runtime and putting the gettext domain into the .schemas file instead of replicating translations in /usr/share/gconf/schemas/*.schemas *and* /var/lib/gconf/defaults/%gconf-tree-$LANG.xml. This saves in the order of 90 MB uncompressed/10 MB compressed on hard disks. +# Ubuntu: https://bugs.launchpad.net/bugs/123025 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=568845 +--- GConf-2.26.0/backends/markup-tree.c.gettext 2009-04-26 23:33:05.258484987 -0400 ++++ GConf-2.26.0/backends/markup-tree.c 2009-04-26 23:34:25.026700526 -0400 +@@ -52,6 +52,7 @@ struct _MarkupEntry + char *schema_name; + char *mod_user; + GTime mod_time; ++ const char *gettext_domain; + }; + + static LocalSchemaInfo* local_schema_info_new (void); +@@ -1593,6 +1594,8 @@ markup_entry_set_value (MarkupEntry + gconf_schema_get_type (schema)); + gconf_schema_set_owner (current_schema, + gconf_schema_get_owner (schema)); ++ gconf_schema_set_gettext_domain (current_schema, ++ gconf_schema_get_gettext_domain (schema)); + } + + /* Update mod time */ +@@ -1805,6 +1808,8 @@ markup_entry_get_value (MarkupEntry *ent + else if (c_local_schema && c_local_schema->long_desc) + gconf_schema_set_long_desc (schema, c_local_schema->long_desc); + ++ gconf_schema_set_gettext_domain (schema, entry->gettext_domain); ++ + return retval; + } + } +@@ -2339,8 +2344,9 @@ parse_value_element (GMarkupParseContext + const char *ltype; + const char *list_type; + const char *owner; ++ + GConfValueType vtype; +- const char *dummy1, *dummy2, *dummy3, *dummy4; ++ const char *dummy1, *dummy2, *dummy3, *dummy4, *dummy5; + + #if 0 + g_assert (ELEMENT_IS ("entry") || +@@ -2377,6 +2383,7 @@ parse_value_element (GMarkupParseContext + "muser", &dummy2, + "mtime", &dummy3, + "schema", &dummy4, ++ "gettext_domain", &dummy5, + + NULL)) + return; +@@ -2683,6 +2690,7 @@ parse_entry_element (GMarkupParseContext + const char *mtime; + const char *schema; + const char *type; ++ const char *gettext_domain; + const char *dummy1, *dummy2, *dummy3, *dummy4; + const char *dummy5, *dummy6, *dummy7; + GConfValue *value; +@@ -2693,6 +2701,7 @@ parse_entry_element (GMarkupParseContext + mtime = NULL; + schema = NULL; + type = NULL; ++ gettext_domain = NULL; + + if (!locate_attributes (context, element_name, attribute_names, attribute_values, + error, +@@ -2701,6 +2710,7 @@ parse_entry_element (GMarkupParseContext + "mtime", &mtime, + "schema", &schema, + "type", &type, ++ "gettext_domain", &gettext_domain, + + /* These are allowed but we don't use them until + * parse_value_element +@@ -2768,6 +2778,9 @@ parse_entry_element (GMarkupParseContext + */ + if (schema) + entry->schema_name = g_strdup (schema); ++ ++ if (gettext_domain) ++ entry->gettext_domain = g_intern_string (gettext_domain); + } + else + { +@@ -3716,6 +3729,7 @@ write_value_element (GConfValue *value, + GConfSchema *schema; + GConfValueType stype; + const char *owner; ++ const char *gettext_domain; + + schema = gconf_value_get_schema (value); + +@@ -3741,6 +3755,23 @@ write_value_element (GConfValue *value, + + g_free (s); + } ++ ++ gettext_domain = gconf_schema_get_gettext_domain (schema); ++ ++ if (gettext_domain) ++ { ++ char *s; ++ ++ s = g_markup_escape_text (gettext_domain, -1); ++ ++ if (fprintf (f, " gettext_domain=\"%s\"", s) < 0) ++ { ++ g_free (s); ++ return FALSE; ++ } ++ ++ g_free (s); ++ } + + if (stype == GCONF_VALUE_LIST) + { +diff -up GConf-2.26.0/doc/gconf-1.0.dtd.gettext GConf-2.26.0/doc/gconf-1.0.dtd +--- GConf-2.26.0/doc/gconf-1.0.dtd.gettext 2009-04-26 23:33:17.240736103 -0400 ++++ GConf-2.26.0/doc/gconf-1.0.dtd 2009-04-26 23:34:25.027700384 -0400 +@@ -7,7 +7,7 @@ + +- ++ + + + +diff -up GConf-2.26.0/gconf/gconf-internals.c.gettext GConf-2.26.0/gconf/gconf-internals.c +--- GConf-2.26.0/gconf/gconf-internals.c.gettext 2009-04-26 23:34:10.994700035 -0400 ++++ GConf-2.26.0/gconf/gconf-internals.c 2009-04-26 23:34:53.767450191 -0400 +@@ -513,6 +513,7 @@ gconf_fill_corba_schema_from_gconf_schem + cs->short_desc = CORBA_string_dup (gconf_schema_get_short_desc (sc) ? gconf_schema_get_short_desc (sc) : ""); + cs->long_desc = CORBA_string_dup (gconf_schema_get_long_desc (sc) ? gconf_schema_get_long_desc (sc) : ""); + cs->owner = CORBA_string_dup (gconf_schema_get_owner (sc) ? gconf_schema_get_owner (sc) : ""); ++ cs->gettext_domain = CORBA_string_dup (gconf_schema_get_gettext_domain (sc) ? gconf_schema_get_gettext_domain (sc) : ""); + + { + gchar* encoded; +@@ -600,6 +601,14 @@ gconf_schema_from_corba_schema(const Con + gconf_schema_set_owner(sc, cs->owner); + } + ++ if (*cs->gettext_domain != '\0') ++ { ++ if (!g_utf8_validate (cs->gettext_domain, -1, NULL)) ++ gconf_log (GCL_ERR, _("Invalid UTF-8 in gettext domain for schema")); ++ else ++ gconf_schema_set_gettext_domain(sc, cs->gettext_domain); ++ } ++ + { + GConfValue* val; + +diff -up GConf-2.26.0/gconf/gconf-schema.c.gettext GConf-2.26.0/gconf/gconf-schema.c +--- GConf-2.26.0/gconf/gconf-schema.c.gettext 2009-04-26 23:33:26.787483545 -0400 ++++ GConf-2.26.0/gconf/gconf-schema.c 2009-04-26 23:35:54.240450142 -0400 +@@ -32,9 +32,10 @@ typedef struct { + GConfValueType car_type; /* Pair car type of the described entry */ + GConfValueType cdr_type; /* Pair cdr type of the described entry */ + gchar* locale; /* Schema locale */ +- gchar* owner; /* Name of creating application */ ++ const gchar* owner; /* Name of creating application */ + gchar* short_desc; /* 40 char or less description, no newlines */ + gchar* long_desc; /* could be a paragraph or so */ ++ const gchar* gettext_domain; /* description gettext domain */ + GConfValue* default_value; /* Default value of the key */ + } GConfRealSchema; + +@@ -63,7 +64,6 @@ gconf_schema_free (GConfSchema* sc) + g_free (real->locale); + g_free (real->short_desc); + g_free (real->long_desc); +- g_free (real->owner); + + if (real->default_value) + gconf_value_free (real->default_value); +@@ -91,7 +91,9 @@ gconf_schema_copy (const GConfSchema* sc + + dest->long_desc = g_strdup (real->long_desc); + +- dest->owner = g_strdup (real->owner); ++ dest->gettext_domain = real->gettext_domain; ++ ++ dest->owner = real->owner; + + dest->default_value = real->default_value ? gconf_value_copy (real->default_value) : NULL; + +@@ -136,6 +138,17 @@ gconf_schema_set_locale (GConfSchema* sc + REAL_SCHEMA (sc)->locale = NULL; + } + ++void ++gconf_schema_set_gettext_domain (GConfSchema* sc, const gchar* domain) ++{ ++ g_return_if_fail (domain == NULL || g_utf8_validate (domain, -1, NULL)); ++ ++ if (domain) ++ REAL_SCHEMA (sc)->gettext_domain = g_intern_string (domain); ++ else ++ REAL_SCHEMA (sc)->gettext_domain = NULL; ++} ++ + void + gconf_schema_set_short_desc (GConfSchema* sc, const gchar* desc) + { +@@ -169,11 +182,8 @@ gconf_schema_set_owner (GConfSchema* sc, + { + g_return_if_fail (owner == NULL || g_utf8_validate (owner, -1, NULL)); + +- if (REAL_SCHEMA (sc)->owner) +- g_free (REAL_SCHEMA (sc)->owner); +- + if (owner) +- REAL_SCHEMA (sc)->owner = g_strdup (owner); ++ REAL_SCHEMA (sc)->owner = g_intern_string (owner); + else + REAL_SCHEMA (sc)->owner = NULL; + } +@@ -228,6 +238,14 @@ gconf_schema_validate (const GConfSchema + return FALSE; + } + ++ if (real->gettext_domain && !g_utf8_validate (real->gettext_domain, -1, NULL)) ++ { ++ g_set_error (err, GCONF_ERROR, ++ GCONF_ERROR_FAILED, ++ _("Schema contains invalid UTF-8")); ++ return FALSE; ++ } ++ + if (real->owner && !g_utf8_validate (real->owner, -1, NULL)) + { + g_set_error (err, GCONF_ERROR, +@@ -299,11 +317,32 @@ gconf_schema_get_locale (const GConfSche + } + + const char* ++gconf_schema_get_gettext_domain (const GConfSchema *schema) ++{ ++ g_return_val_if_fail (schema != NULL, NULL); ++ ++ return REAL_SCHEMA (schema)->gettext_domain; ++} ++ ++static inline const char * ++schema_translate (const GConfSchema *schema, ++ const char *string) ++{ ++ if (REAL_SCHEMA (schema)->gettext_domain) ++ { ++ bind_textdomain_codeset (REAL_SCHEMA (schema)->gettext_domain, "UTF-8"); ++ return g_dgettext(REAL_SCHEMA (schema)->gettext_domain, string); ++ } ++ else ++ return string; ++} ++ ++const char* + gconf_schema_get_short_desc (const GConfSchema *schema) + { + g_return_val_if_fail (schema != NULL, NULL); + +- return REAL_SCHEMA (schema)->short_desc; ++ return schema_translate (schema, REAL_SCHEMA (schema)->short_desc); + } + + const char* +@@ -311,7 +350,7 @@ gconf_schema_get_long_desc (const GConfS + { + g_return_val_if_fail (schema != NULL, NULL); + +- return REAL_SCHEMA (schema)->long_desc; ++ return schema_translate (schema, REAL_SCHEMA (schema)->long_desc); + } + + const char* +diff -up GConf-2.26.0/gconf/gconf-schema.h.gettext GConf-2.26.0/gconf/gconf-schema.h +--- GConf-2.26.0/gconf/gconf-schema.h.gettext 2009-04-26 23:33:33.979744088 -0400 ++++ GConf-2.26.0/gconf/gconf-schema.h 2009-04-26 23:34:25.030737043 -0400 +@@ -48,6 +48,8 @@ void gconf_schema_set_cdr_type + GConfValueType type); + void gconf_schema_set_locale (GConfSchema *sc, + const gchar *locale); ++void gconf_schema_set_gettext_domain (GConfSchema *sc, ++ const gchar *domain); + void gconf_schema_set_short_desc (GConfSchema *sc, + const gchar *desc); + void gconf_schema_set_long_desc (GConfSchema *sc, +@@ -65,6 +67,7 @@ GConfValueType gconf_schema_get_list_typ + GConfValueType gconf_schema_get_car_type (const GConfSchema *schema); + GConfValueType gconf_schema_get_cdr_type (const GConfSchema *schema); + const char* gconf_schema_get_locale (const GConfSchema *schema); ++const char* gconf_schema_get_gettext_domain(const GConfSchema *schema); + const char* gconf_schema_get_short_desc (const GConfSchema *schema); + const char* gconf_schema_get_long_desc (const GConfSchema *schema); + const char* gconf_schema_get_owner (const GConfSchema *schema); +diff -up GConf-2.26.0/gconf/gconftool.c.gettext GConf-2.26.0/gconf/gconftool.c +--- GConf-2.26.0/gconf/gconftool.c.gettext 2009-04-26 23:33:41.907451190 -0400 ++++ GConf-2.26.0/gconf/gconftool.c 2009-04-26 23:34:25.034736752 -0400 +@@ -3295,6 +3295,7 @@ struct _SchemaInfo { + GConfValueType cdr_type; + GConfValue* global_default; + GHashTable* hash; ++ gchar* gettext_domain; + }; + + static int +@@ -3547,6 +3548,15 @@ extract_global_info(xmlNodePtr node, + else + g_printerr (_("WARNING: empty node")); + } ++ else if (strcmp((char *)iter->name, "gettext_domain") == 0) ++ { ++ tmp = (char *)xmlNodeGetContent(iter); ++ if (tmp) ++ { ++ info->gettext_domain = g_strdup(tmp); ++ xmlFree(tmp); ++ } ++ } + else + g_printerr (_("WARNING: node <%s> not understood below \n"), + iter->name); +@@ -3636,6 +3646,9 @@ process_locale_info(xmlNodePtr node, Sch + if (info->owner != NULL) + gconf_schema_set_owner(schema, info->owner); + ++ if (info->gettext_domain != NULL) ++ gconf_schema_set_gettext_domain(schema, info->gettext_domain); ++ + xmlFree(name); + + /* Locale-specific info */ +@@ -3765,6 +3778,7 @@ get_schema_from_xml(xmlNodePtr node, gch + info.apply_to = NULL; + info.owner = NULL; + info.global_default = NULL; ++ info.gettext_domain = NULL; + info.hash = g_hash_table_new(g_str_hash, g_str_equal); + + extract_global_info(node, &info); +@@ -3801,6 +3815,8 @@ get_schema_from_xml(xmlNodePtr node, gch + ; /* nothing */ + else if (strcmp((char *)iter->name, "applyto") == 0) + ; /* nothing */ ++ else if (strcmp((char *)iter->name, "gettext_domain") == 0) ++ ; /* nothing */ + else if (strcmp((char *)iter->name, "locale") == 0) + { + process_locale_info(iter, &info); +diff -up GConf-2.26.0/gconf/GConfX.idl.gettext GConf-2.26.0/gconf/GConfX.idl +--- GConf-2.26.0/gconf/GConfX.idl.gettext 2009-04-26 23:33:58.457483190 -0400 ++++ GConf-2.26.0/gconf/GConfX.idl 2009-04-26 23:34:53.764448732 -0400 +@@ -16,6 +16,7 @@ struct ConfigSchema { + string short_desc; + string long_desc; + string owner; ++ string gettext_domain; + // Work around lack of recursive data types + string encoded_default_value; + }; diff --git a/testing/gconf/PKGBUILD b/testing/gconf/PKGBUILD new file mode 100644 index 000000000..dee7db3b2 --- /dev/null +++ b/testing/gconf/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 155070 2012-04-01 11:32:04Z heftig $ +# Maintainer: Jan de Groot + +pkgname=gconf +pkgver=3.2.5 +pkgrel=2 +pkgdesc="A configuration database system" +arch=(i686 x86_64) +license=('LGPL') +depends=('libxml2' 'polkit' 'libldap' 'dbus-glib' 'gtk3') +makedepends=('intltool' 'gtk-doc' 'gobject-introspection') +options=('!libtool') +install=gconf.install +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/GConf/3.2/GConf-$pkgver.tar.xz + gconf-merge-schema + gconfpkg + gconf-reload.patch + 01_xml-gettext-domain.patch) +sha256sums=('4ddea9503a212ee126c5b46a0a958fd5484574c3cb6ef2baf38db02e819e58c6' + 'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028' + 'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898' + '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694' + 'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8') + +build() { + cd "GConf-$pkgver" + # Patch from fedora - reloads gconf after installing schemas + patch -Np1 -i "$srcdir/gconf-reload.patch" + # http://bugzilla.gnome.org/show_bug.cgi?id=568845 + patch -Np1 -i "$srcdir/01_xml-gettext-domain.patch" + + # Python2 fix + sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/GConf \ + --disable-static --enable-defaults-service --with-gtk=3.0 \ + --disable-orbit + + make pkglibdir=/usr/lib/GConf +} + +package() { + cd "GConf-$pkgver" + make DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/etc/gconf/gconf.xml.system" + install -m755 "$srcdir/gconf-merge-schema" "$pkgdir/usr/bin/" + install -Dm755 "$srcdir/gconfpkg" "$pkgdir/usr/sbin/gconfpkg" +} diff --git a/testing/gconf/gconf-merge-schema b/testing/gconf/gconf-merge-schema new file mode 100755 index 000000000..992c162e6 --- /dev/null +++ b/testing/gconf/gconf-merge-schema @@ -0,0 +1,34 @@ +#!/bin/bash +if [ ! "$1" -a ! "$2" ]; then + echo "Usage: $0 output.schemas [--domain gettextdomain] file1.schemas [file2.schemas [...]]" + exit 1 +fi + +OUTFILE="$1" +DOMAIN="" +shift + +if [ "$1" = "--domain" ]; then + shift + DOMAIN=$1 + shift +fi + +echo '' > "$OUTFILE" +echo '' >> "$OUTFILE" + +while [ "$1" ]; do + if [ -f "$1" ]; then + sed -e '/||g' \ + -e 's|||g' \ + -e 's|||g' \ + -e 's|||g' "$1" >> "$OUTFILE" + fi + shift +done + +echo '' >> "$OUTFILE" +if [ "$DOMAIN" != "" ]; then + sed -ri "s/^([[:space:]]*)()/\1$DOMAIN<\/gettext_domain>\n\1\2/; /^[[:space:]]*[[:space:]]*\$/ d; /^$/d; s/<\/schema>$/&\n/" "$OUTFILE" +fi diff --git a/testing/gconf/gconf-reload.patch b/testing/gconf/gconf-reload.patch new file mode 100644 index 000000000..910f0dae4 --- /dev/null +++ b/testing/gconf/gconf-reload.patch @@ -0,0 +1,20 @@ +--- GConf-2.16.0/gconf/gconftool.c.orig 2006-10-14 17:37:14.000000000 +0000 ++++ GConf-2.16.0/gconf/gconftool.c 2006-10-14 17:39:27.000000000 +0000 +@@ -963,6 +963,8 @@ main (int argc, char** argv) + + gconf_engine_unref (conf); + ++ g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL); ++ + return retval; + } + +@@ -975,6 +977,8 @@ main (int argc, char** argv) + + gconf_engine_unref (conf); + ++ g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL); ++ + return retval; + } + diff --git a/testing/gconf/gconf.install b/testing/gconf/gconf.install new file mode 100644 index 000000000..f7945d165 --- /dev/null +++ b/testing/gconf/gconf.install @@ -0,0 +1,20 @@ +post_install() { + ldconfig -r . + chmod 755 etc/gconf/gconf.xml.system + usr/bin/gio-querymodules usr/lib/gio/modules +} + +post_upgrade() { + ldconfig -r . + chmod 755 etc/gconf/gconf.xml.system + usr/bin/gio-querymodules usr/lib/gio/modules + + PID=`pidof gconfd-2` + if [ ! -z "${PID}" ]; then + kill ${PID} + fi +} + +post_remove() { + usr/bin/gio-querymodules usr/lib/gio/modules +} diff --git a/testing/gconf/gconfpkg b/testing/gconf/gconfpkg new file mode 100755 index 000000000..72021e45e --- /dev/null +++ b/testing/gconf/gconfpkg @@ -0,0 +1,50 @@ +#!/bin/sh + +usage() { +cat << _EOF +Usage: + gconfpkg [OPTION] [PACKAGE] + + Help Options: + -?, --help Show help options + + Application Options: + --install Install schemas for a given package + --uninstall Uninstall schemas for a given package + +_EOF +} + +install() { + GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \ + /usr/bin/gconftool-2 --makefile-install-rule /usr/share/gconf/schemas/${pkgname}.schemas >/dev/null +} + +uninstall() { + if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then + schemas=/usr/share/gconf/schemas/${pkgname}.schemas + elif [ -f /opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then + schemas=/opt/gnome/share/gconf/schemas/${pkgname}.schemas + else + schemas=`pacman -Ql ${pkgname} | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'` + fi + GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` \ + /usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas} >/dev/null +} + +if [ -z "$2" ]; then + usage +else + pkgname="$2" + case "$1" in + --install) + install + ;; + --uninstall) + uninstall + ;; + *) + usage + ;; + esac +fi diff --git a/testing/gcr/PKGBUILD b/testing/gcr/PKGBUILD new file mode 100644 index 000000000..58191df8d --- /dev/null +++ b/testing/gcr/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 155072 2012-04-01 11:32:07Z heftig $ +# Maintainer: Ionut Biru + +pkgname=gcr +pkgver=3.4.0 +pkgrel=1 +pkgdesc="A library for bits of crypto UI and parsing" +arch=(i686 x86_64) +url="http://www.gnome.org" +license=('GPL2') +depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt') +makedepends=('intltool' 'gobject-introspection') +options=(!libtool) +install=gcr.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('6cb92178a04b5ea335102b43027420c200fe6a053e5e2009ffae91914a268106') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --libexec=/usr/lib/gcr \ + --disable-static \ + --disable-update-mime \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/gcr/gcr.install b/testing/gcr/gcr.install new file mode 100644 index 000000000..8677671c4 --- /dev/null +++ b/testing/gcr/gcr.install @@ -0,0 +1,14 @@ +post_install () { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-mime-database /usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade () { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gdk-pixbuf2/PKGBUILD b/testing/gdk-pixbuf2/PKGBUILD new file mode 100644 index 000000000..e65888711 --- /dev/null +++ b/testing/gdk-pixbuf2/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 155074 2012-04-01 11:32:10Z heftig $ +# Maintainer: Ionut Biru + +pkgname=gdk-pixbuf2 +pkgver=2.26.0 +pkgrel=1 +pkgdesc="An image loading library" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL2') +depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11') +makedepends=('gtk-doc' 'gobject-introspection') +options=('!libtool') +install=gdk-pixbuf2.install +source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz) +sha256sums=('a5028d3a33710cbb6c6264bc561b6e252b37f067dff7b5b52473621e064f254d') + +build() { + cd "gdk-pixbuf-$pkgver" + + ./configure --prefix=/usr \ + --without-libjasper \ + --with-x11 \ + --with-included-loaders=png + make +} + +package() { + cd "gdk-pixbuf-$pkgver" + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/gdk-pixbuf2/gdk-pixbuf2.install b/testing/gdk-pixbuf2/gdk-pixbuf2.install new file mode 100644 index 000000000..9a26e38dc --- /dev/null +++ b/testing/gdk-pixbuf2/gdk-pixbuf2.install @@ -0,0 +1,11 @@ +post_install() { + /usr/bin/gdk-pixbuf-query-loaders --update-cache +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache +} diff --git a/testing/gdl/PKGBUILD b/testing/gdl/PKGBUILD new file mode 100644 index 000000000..c352df8e9 --- /dev/null +++ b/testing/gdl/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 155076 2012-04-01 11:32:13Z heftig $ +# Maintainer: Jan de Groot + +pkgname=gdl +pkgver=3.4.1 +pkgrel=1 +pkgdesc="GNOME Docking Library" +arch=(i686 x86_64) +license=('GPL') +url="http://www.gnome.org/" +depends=('gtk3') +makedepends=('gtk-doc' 'intltool' 'gobject-introspection') +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('82fedce869a40d36394faa441472318746f7431ae051d99ada6df206ba027f5e') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/gdm/PKGBUILD b/testing/gdm/PKGBUILD new file mode 100644 index 000000000..5fab71d9c --- /dev/null +++ b/testing/gdm/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 155078 2012-04-01 11:32:19Z heftig $ +# Maintainer: Jan de Groot + +pkgname=gdm +pkgver=3.4.0.1 +pkgrel=1 +pkgdesc="Gnome Display Manager (a reimplementation of xdm)" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org" +backup=('etc/pam.d/gdm-autologin' 'etc/pam.d/gdm-fingerprint' 'etc/pam.d/gdm' 'etc/pam.d/gdm-password' + 'etc/pam.d/gdm-smartcard' 'etc/pam.d/gdm-welcome' 'etc/gdm/custom.conf') +groups=('gnome-extra') +options=('!libtool') +depends=('libcanberra' 'libxklavier' 'gnome-session' 'gnome-settings-daemon' 'metacity' 'upower' 'accountsservice' 'consolekit' 'xorg-xrdb' 'nss') +makedepends=('intltool' 'gnome-doc-utils' 'xorg-server' 'gobject-introspection') +optdepends=('gnome-shell: new login interface' + 'fprintd: fingerprint authentication') +install=gdm.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz + fix_external_program_directories.patch + gdm-vt-allocation-hack.patch + gdm + gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam) +sha256sums=('08686e32f35f65fc5578b48db802fc5e5ca4ca3c3adbbe0d2488ddc1c6f279cd' + 'f68600ccf80f475deb417d58ab3306c4a1ba4622688e2901996c8549c85a9ee6' + '3c8b588d4af08d94dc93bcd5e4c2a983c3f4fbbbe40833bceac2a1df4f1e8215' + '272c08d8e8b50bf424d0705ac864d4c18c47ec4f6893b1af732c2efbc86c9550' + 'b30dfa217718b43ff3aa4e8af08985963175b79ff30698ec54e8396d2905922d' + '5bc3ff3ea7b31219dfcb7d9fc0eb2819eca1c5573a0f426d288a17560a69633e' + 'f1dfa4d88288d4b0a631a68a51b46c2da537bee8fe5a99f9f288c8ff75a50b19' + '92aded0804bad8a609fd150448ad4a2edb8166c17cb4e2b581559e80603bbb6c' + 'df74b0dcfb17ea43cc1e268a27cd256c552672457db1af40b285452d16b3e2fd' + '39bf3824cc505043dc3136356da16dab9df9f369f1077435a324be2ac16cf834') + +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/fix_external_program_directories.patch" + patch -Np1 -i "$srcdir/gdm-vt-allocation-hack.patch" + + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gdm \ + --localstatedir=/var \ + --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \ + --disable-scrollkeeper \ + --disable-static \ + --without-tcp-wrappers \ + --disable-schemas-compile \ + --with-systemd=no + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + for i in gdm-autologin.pam gdm-fingerprint.pam gdm.pam gdm-password.pam gdm-smartcard.pam gdm-welcome.pam;do + install -m644 "$srcdir/$i" "$pkgdir/etc/pam.d/${i%.pam}" + done + + install -Dm755 "${srcdir}/gdm" "${pkgdir}/etc/rc.d/gdm" + + chmod 1770 "$pkgdir/var/log/gdm" + chmod 700 "$pkgdir/var/lib/gdm/.config/dconf" + rm -rf "$pkgdir/var/run" "$pkgdir/var/gdm" +} diff --git a/testing/gdm/fix_external_program_directories.patch b/testing/gdm/fix_external_program_directories.patch new file mode 100644 index 000000000..b3a0f0cf6 --- /dev/null +++ b/testing/gdm/fix_external_program_directories.patch @@ -0,0 +1,34 @@ +diff -Nur gdm-3.3.92.orig/daemon/gdm-server.c gdm-3.3.92/daemon/gdm-server.c +--- gdm-3.3.92.orig/daemon/gdm-server.c 2012-03-19 22:30:05.311490006 +0000 ++++ gdm-3.3.92/daemon/gdm-server.c 2012-03-19 22:30:17.004732251 +0000 +@@ -139,7 +139,7 @@ + g_return_val_if_fail (GDM_IS_SERVER (server), NULL); + + error = NULL; +- command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s", ++ command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s", + server->priv->display_name); + + g_debug ("GdmServer: Running helper %s", command); +diff -Nur gdm-3.3.92.orig/data/gdm-shell.session.in gdm-3.3.92/data/gdm-shell.session.in +--- gdm-3.3.92.orig/data/gdm-shell.session.in 2012-03-19 22:30:05.311490006 +0000 ++++ gdm-3.3.92/data/gdm-shell.session.in 2012-03-19 22:30:17.004732251 +0000 +@@ -1,5 +1,5 @@ + [GNOME Session] + Name=Display Manager + RequiredComponents=gnome-shell;gnome-settings-daemon; +-IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated' ++IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && /usr/lib/gnome-session/gnome-session-check-accelerated' + FallbackSession=gdm-fallback +diff -Nur gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c +--- gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c 2012-03-19 22:30:05.304823391 +0000 ++++ gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c 2012-03-19 22:30:17.004732251 +0000 +@@ -131,7 +131,7 @@ + ret = FALSE; + + error = NULL; +- g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error); ++ g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon", &error); + if (error != NULL) { + g_warning ("Error starting settings daemon: %s", error->message); + g_error_free (error); diff --git a/testing/gdm/gdm b/testing/gdm/gdm new file mode 100755 index 000000000..c3e635a6d --- /dev/null +++ b/testing/gdm/gdm @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting GDM" + /usr/sbin/gdm & + if [ $? -gt 0 ]; then + stat_fail + else + + add_daemon gdm + stat_done + fi + ;; + stop) + stat_busy "Stopping GDM" + [ -f /var/run/gdm.pid ] && kill `cat /var/run/gdm.pid` &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon gdm + stat_done + fi + ;; + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/gdm/gdm-autologin.pam b/testing/gdm/gdm-autologin.pam new file mode 100644 index 000000000..c77c78917 --- /dev/null +++ b/testing/gdm/gdm-autologin.pam @@ -0,0 +1,18 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so + +auth requisite pam_permit.so + +auth sufficient pam_succeed_if.so uid >= 1000 quiet +auth required pam_deny.so + +account required pam_unix.so + +password required pam_deny.so + +session required pam_loginuid.so +-session optional pam_systemd.so +session optional pam_keyinit.so revoke +session required pam_limits.so +session required pam_unix.so diff --git a/testing/gdm/gdm-fingerprint.pam b/testing/gdm/gdm-fingerprint.pam new file mode 100644 index 000000000..5b74bf6d6 --- /dev/null +++ b/testing/gdm/gdm-fingerprint.pam @@ -0,0 +1,18 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so + +auth requisite pam_fprintd.so + +auth sufficient pam_succeed_if.so uid >= 1000 quiet +auth required pam_deny.so + +account required pam_unix.so + +password required pam_deny.so + +session required pam_loginuid.so +-session optional pam_systemd.so +session optional pam_keyinit.so revoke +session required pam_limits.so +session required pam_unix.so diff --git a/testing/gdm/gdm-password.pam b/testing/gdm/gdm-password.pam new file mode 100644 index 000000000..aa4d4dd47 --- /dev/null +++ b/testing/gdm/gdm-password.pam @@ -0,0 +1,20 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so + +auth requisite pam_unix.so nullok +auth optional pam_gnome_keyring.so + +auth sufficient pam_succeed_if.so uid >= 1000 quiet +auth required pam_deny.so + +account required pam_unix.so + +password required pam_unix.so + +session required pam_loginuid.so +-session optional pam_systemd.so +session optional pam_keyinit.so force revoke +session required pam_limits.so +session required pam_unix.so +session optional pam_gnome_keyring.so auto_start diff --git a/testing/gdm/gdm-smartcard.pam b/testing/gdm/gdm-smartcard.pam new file mode 100644 index 000000000..baacb8bed --- /dev/null +++ b/testing/gdm/gdm-smartcard.pam @@ -0,0 +1,18 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so + +auth requisite pam_pkcs11.so wait_for_card card_only + +auth sufficient pam_succeed_if.so uid >= 1000 quiet +auth required pam_deny.so + +account required pam_unix.so + +password required pam_pkcs11.so + +session required pam_loginuid.so +-session optional pam_systemd.so +session optional pam_keyinit.so revoke +session required pam_limits.so +session required pam_unix.so diff --git a/testing/gdm/gdm-vt-allocation-hack.patch b/testing/gdm/gdm-vt-allocation-hack.patch new file mode 100644 index 000000000..56fa5a151 --- /dev/null +++ b/testing/gdm/gdm-vt-allocation-hack.patch @@ -0,0 +1,118 @@ +diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c +index 39def47..03488fd 100644 +--- a/daemon/gdm-server.c ++++ b/daemon/gdm-server.c +@@ -33,6 +33,8 @@ + #include + #include + #include ++#include ++#include + + #include + #include +@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server) + return out; + } + ++#ifndef O_NOCTTY ++# define O_NOCTTY 0 ++#endif ++ ++static int ++open_vt (int vtno) ++{ ++ char *vtname; ++ int fd; ++ ++ vtname = g_strdup_printf ("/dev/tty%d", vtno); ++ ++ do { ++ errno = 0; ++ fd = open (vtname, O_RDWR | O_NOCTTY, 0); ++ } while (errno == EINTR); ++ ++ g_free (vtname); ++ return fd; ++} ++ ++static gint ++find_first_probably_free_vt (void) ++{ ++ int fd, fdv; ++ int vtno; ++ unsigned short vtmask; ++ struct vt_stat vtstat; ++ guint v_state; ++ ++ fdv = -1; ++ ++ do { ++ errno = 0; ++ fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0); ++ } while (errno == EINTR); ++ ++ if (fd >= 0) { ++ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) { ++ v_state = vtstat.v_state; ++ } else { ++ close (fd); ++ v_state = 0; ++ fd = -1; ++ } ++ } else { ++ v_state = 0; ++ } ++ ++ if (fd < 0) { ++ do { ++ errno = 0; ++ fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0); ++ } while (errno == EINTR); ++ ++ if (fd >= 0) { ++ if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) ++ v_state = vtstat.v_state; ++ } ++ } ++ ++ for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) { ++ /* Is this console in use? */ ++ if (v_state & vtmask) ++ continue; ++ ++ /* No, try to open it */ ++ fdv = open_vt (vtno); ++ if (fdv >= 0) ++ break; ++ ++ /* If we're here, kernel indicated that the console was free, ++ * but we failed to open it. Just go on to higher VTs. */ ++ } ++ ++ if (fdv >= 0) ++ close (fdv); ++ else ++ vtno = -1; ++ ++ if (fd >= 0) ++ close (fd); ++ ++ return vtno; ++} ++ + char * + gdm_server_get_display_device (GdmServer *server) + { +@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer *server, + + if (vtarg != NULL && ! gotvtarg) { + argv[len++] = g_strdup (vtarg); ++ } else if (!query_in_arglist && !gotvtarg) { ++ gint vtnum = find_first_probably_free_vt (); ++ ++ if (vtnum > 0) ++ argv [len++] = g_strdup_printf ("vt%d", vtnum); + } + + argv[len++] = NULL; diff --git a/testing/gdm/gdm-welcome.pam b/testing/gdm/gdm-welcome.pam new file mode 100644 index 000000000..cc3811c19 --- /dev/null +++ b/testing/gdm/gdm-welcome.pam @@ -0,0 +1,12 @@ +#%PAM-1.0 +auth required pam_env.so +auth required pam_permit.so + +account required pam_nologin.so +account required pam_unix.so + +password required pam_deny.so + +session required pam_loginuid.so +-session optional pam_systemd.so +session optional pam_keyinit.so force revoke diff --git a/testing/gdm/gdm.install b/testing/gdm/gdm.install new file mode 100644 index 000000000..c48faf4ae --- /dev/null +++ b/testing/gdm/gdm.install @@ -0,0 +1,30 @@ +pkgname=gdm + +post_install() { + getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm + getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm + passwd -l gdm > /dev/null + chown -R gdm:gdm /var/lib/gdm > /dev/null + + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + dconf update +} + +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then + gconfpkg --uninstall ${pkgname} + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + glib-compile-schemas /usr/share/glib-2.0/schemas + dconf update + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + getent passwd gdm >/dev/null 2>&1 && userdel gdm + getent group gdm >/dev/null 2>&1 && groupdel gdm +} diff --git a/testing/gdm/gdm.pam b/testing/gdm/gdm.pam new file mode 100644 index 000000000..655299cb7 --- /dev/null +++ b/testing/gdm/gdm.pam @@ -0,0 +1,10 @@ +#%PAM-1.0 +auth requisite pam_nologin.so +auth required pam_env.so +auth required pam_unix.so +auth optional pam_gnome_keyring.so +account required pam_unix.so +session required pam_limits.so +session required pam_unix.so +session optional pam_gnome_keyring.so auto_start +password required pam_unix.so diff --git a/testing/gedit/PKGBUILD b/testing/gedit/PKGBUILD new file mode 100644 index 000000000..8d04b1f68 --- /dev/null +++ b/testing/gedit/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 155080 2012-04-01 11:32:21Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=gedit +pkgver=3.4.0 +pkgrel=1 +pkgdesc="A text editor for GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf') +makedepends=('yelp-tools' 'intltool') +groups=('gnome-extra') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +install=gedit.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('a51bb8d60bfd9b37edf04228c7493d256e73a6b5f025f8b4900431673ac34e3f') + +build() { + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib --disable-updater --disable-schemas-compile \ + --enable-python + make +} + +package(){ + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/gedit/gedit.install b/testing/gedit/gedit.install new file mode 100644 index 000000000..9d88a1341 --- /dev/null +++ b/testing/gedit/gedit.install @@ -0,0 +1,18 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q +} + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/gedit.schemas ]; then + usr/sbin/gconfpkg --uninstall gedit + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/geoclue/PKGBUILD b/testing/geoclue/PKGBUILD new file mode 100644 index 000000000..16b8a9a30 --- /dev/null +++ b/testing/geoclue/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 155303 2012-04-01 14:17:14Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: György Balló + +pkgname=geoclue +pkgver=0.12.0 +pkgrel=5 +pkgdesc="Modular geoinformation service built on the D-Bus messaging system." +arch=('i686' 'x86_64') +url="http://geoclue.freedesktop.org/" +license=('LGPL') +depends=('dbus-glib' 'libxml2') +optdepends=('networkmanager: geolocation' + 'gconf: geolocation' + 'libsoup-gnome: Skyhook location provider') +makedepends=('gconf' 'networkmanager' 'libsoup-gnome' 'gtk-doc') +options=('!libtool') +source=(https://launchpad.net/geoclue/trunk/${pkgver%.*}/+download/$pkgname-$pkgver.tar.gz + geoclue-gcc46.patch) +md5sums=('33af8307f332e0065af056ecba65fec2' + '0cf8ecc350be702f623ed9a9715818c5') + +build() { + cd $pkgname-$pkgver + patch -Np1 -i ../geoclue-gcc46.patch + + sed -i 's/libnm_glib/libnm-glib/g' configure.ac + sed -i '/libsoup-gnome/s/$/ gthread-2.0/' configure.ac + autoreconf -f -i + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ + --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/geoclue/geoclue-gcc46.patch b/testing/geoclue/geoclue-gcc46.patch new file mode 100644 index 000000000..11bf48547 --- /dev/null +++ b/testing/geoclue/geoclue-gcc46.patch @@ -0,0 +1,23 @@ +From 90669619d1d621080ef00dcb8db1c3d206ee0bfe Mon Sep 17 00:00:00 2001 +From: Dan Williams +Date: Mon, 07 Mar 2011 23:46:15 +0000 +Subject: master: Fix warning with GCC 4.6 + +--- +diff --git a/src/master-provider.c b/src/master-provider.c +index 790c043..e4ea053 100644 +--- a/src/master-provider.c ++++ b/src/master-provider.c +@@ -846,10 +846,6 @@ gc_master_provider_initialize_interfaces (GcMasterProvider *provider) + static gboolean + gc_master_provider_initialize (GcMasterProvider *provider) + { +- GcMasterProviderPrivate *priv; +- +- priv = GET_PRIVATE (provider); +- + if (!gc_master_provider_initialize_interfaces (provider)) { + return FALSE; + } +-- +cgit v0.8.3-6-g21f6 diff --git a/testing/ghex/PKGBUILD b/testing/ghex/PKGBUILD new file mode 100644 index 000000000..c7e7abf77 --- /dev/null +++ b/testing/ghex/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 155084 2012-04-01 11:32:27Z heftig $ +# Maintainer: tobias +# Contributor: Tobias Kieslich + +pkgname=ghex +pkgver=3.4.0 +pkgrel=1 +pkgdesc="A simple binary editor for the Gnome desktop" +arch=('i686' 'x86_64') +license=('GPL') +url="http://live.gnome.org/Ghex" +depends=('gtk3' 'hicolor-icon-theme') +makedepends=('intltool' 'gnome-doc-utils') +options=('!libtool' '!emptydirs') +install=ghex.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('59e409cc629fddeb06552c505b60be1d20274cea75eb22f1d65d7ca0aaf1e64d') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/ghex/ghex.install b/testing/ghex/ghex.install new file mode 100644 index 000000000..084bc82ee --- /dev/null +++ b/testing/ghex/ghex.install @@ -0,0 +1,20 @@ +pkgname=ghex + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then + gconfpkg --uninstall $pkgname + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/gjs/PKGBUILD b/testing/gjs/PKGBUILD new file mode 100644 index 000000000..4e2d2daad --- /dev/null +++ b/testing/gjs/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 155086 2012-04-01 11:32:30Z heftig $ +# Maintainer: Ionut Biru + +pkgname=gjs +pkgver=1.32.0 +pkgrel=1 +pkgdesc="Javascript Bindings for GNOME" +arch=('i686' 'x86_64') +url="http://live.gnome.org/Gjs" +license=('GPL') +depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js') +options=('!libtool') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('b9f1dc156c15806824c936bb08ddc5048f52f6921654146c47025a62457108c0') + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i 's|python|python2|' scripts/make-tests + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/glade/PKGBUILD b/testing/glade/PKGBUILD new file mode 100644 index 000000000..43731b0de --- /dev/null +++ b/testing/glade/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 155088 2012-04-01 11:32:32Z heftig $ +# Maintainer: Douglas Soares de Andrade + +pkgname=glade +pkgver=3.12.0 +pkgrel=1 +pkgdesc="User interface builder for GTK+ and GNOME." +arch=(i686 x86_64) +license=('GPL' 'LGPL') +depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject') +optdepends=('python2: Python widgets support') +options=('!libtool') +url="http://glade.gnome.org/" +install=glade.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('70a820a0007fa3ed7761c92b011fe35ac1532038cab2f9ab30f4d29d5799d44d') + +build() { + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/glade/glade.install b/testing/glade/glade.install new file mode 100644 index 000000000..bce670aff --- /dev/null +++ b/testing/glade/glade.install @@ -0,0 +1,12 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/glib-networking/PKGBUILD b/testing/glib-networking/PKGBUILD new file mode 100644 index 000000000..630479036 --- /dev/null +++ b/testing/glib-networking/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 155094 2012-04-01 11:32:42Z heftig $ +# Maintainer: Jan "heftig" Steffens + +pkgname=glib-networking +pkgver=2.32.0 +pkgrel=1 +pkgdesc="Network-related giomodules for glib" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL2') +depends=('glib2' 'libproxy' 'gnutls' 'libgcrypt' 'ca-certificates' 'gsettings-desktop-schemas') +makedepends=('intltool') +options=('!libtool') +install=glib-networking.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('3f399f8a8977bef5b07a89772ab473ee247773ac7362e4ebfb1f4643828838dc') + +build() { + cd "$pkgname-$pkgver" + ./configure \ + --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/glib-networking --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/glib-networking/glib-networking.install b/testing/glib-networking/glib-networking.install new file mode 100644 index 000000000..e1b80c438 --- /dev/null +++ b/testing/glib-networking/glib-networking.install @@ -0,0 +1,11 @@ +post_install() { + /usr/bin/gio-querymodules /usr/lib/gio/modules +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD new file mode 100644 index 000000000..9874e6dbd --- /dev/null +++ b/testing/glib2/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 155090 2012-04-01 11:32:36Z heftig $ +# Maintainer: Jan de Groot + +pkgname=glib2 +pkgver=2.32.0 +pkgrel=1 +pkgdesc="Common C routines used by GTK+ and other libs" +url="http://www.gtk.org/" +arch=(i686 x86_64) +license=('LGPL') +depends=('pcre' 'libffi') +makedepends=('pkgconfig' 'python2') +optdepends=('python2: for gdbus-codegen') +options=('!libtool' '!docs' '!emptydirs') +source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz + glib2.sh + glib2.csh) +sha256sums=('cde9d9f25ed648069c547e323897ad9379974e1f936b4477fa51bcf1bb261ae4' + '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' + '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3') + +build() { + cd glib-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-pcre=system \ + --disable-fam + make +} + +package() { + cd glib-$pkgver + make DESTDIR="$pkgdir" install + + install -d "$pkgdir/etc/profile.d" + install -m755 "$srcdir/glib2.sh" "$pkgdir/etc/profile.d/" + install -m755 "$srcdir/glib2.csh" "$pkgdir/etc/profile.d/" + + for _i in "$pkgdir/etc/bash_completion.d/"*; do + chmod -x "$_i" + done + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen +} diff --git a/testing/glib2/glib2.csh b/testing/glib2/glib2.csh new file mode 100644 index 000000000..7aa3a2ffa --- /dev/null +++ b/testing/glib2/glib2.csh @@ -0,0 +1 @@ +setenv G_BROKEN_FILENAMES 1 diff --git a/testing/glib2/glib2.sh b/testing/glib2/glib2.sh new file mode 100644 index 000000000..96a056e1e --- /dev/null +++ b/testing/glib2/glib2.sh @@ -0,0 +1 @@ +export G_BROKEN_FILENAMES=1 diff --git a/testing/glibmm/PKGBUILD b/testing/glibmm/PKGBUILD new file mode 100644 index 000000000..86ac83447 --- /dev/null +++ b/testing/glibmm/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 155092 2012-04-01 11:32:39Z heftig $ +# Maintainer: Jan de Groot +# Contributor: Tom Newsom + +pkgbase=glibmm +pkgname=('glibmm' 'glibmm-docs') +pkgver=2.31.22 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('glib2' 'libsigc++2.0' 'pkgconfig') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +options=('!libtool') +url="http://www.gtkmm.org/" +sha256sums=('9941c75c8a6c89d25db5d612ac96da4ebbac0f0bbde6958fd8ea21d1e864bf4e') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package_glibmm() { + pkgdesc="Glib-- (glibmm) is a C++ interface for glib" + depends=('glib2' 'libsigc++2.0') + cd "$pkgbase-$pkgver" + sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile + make DESTDIR="$pkgdir" install +} + +package_glibmm-docs() { + pkgdesc="Developer documentation for glibmm" + cd "$pkgbase-$pkgver/docs" + make DESTDIR="$pkgdir" install +} diff --git a/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules b/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules new file mode 100644 index 000000000..a76c1e73c --- /dev/null +++ b/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules @@ -0,0 +1,11 @@ +# Get access to /dev/rfkill for users +# See https://bugzilla.redhat.com/show_bug.cgi?id=514798 +# +# Updated for udev >= 154 +# http://bugs.debian.org/582188 +# https://bugzilla.redhat.com/show_bug.cgi?id=588660 + +ENV{ACL_MANAGE}=="0", GOTO="gnome_bluetooth_end" +ACTION!="add|change", GOTO="gnome_bluetooth_end" +KERNEL=="rfkill", TAG+="udev-acl" +LABEL="gnome_bluetooth_end" diff --git a/testing/gnome-bluetooth/PKGBUILD b/testing/gnome-bluetooth/PKGBUILD new file mode 100644 index 000000000..f9822ef2d --- /dev/null +++ b/testing/gnome-bluetooth/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 155097 2012-04-01 11:32:46Z heftig $ +# Maintainer: Ionut Biru +# Contributor: Roman Kyrylych + +pkgname=gnome-bluetooth +pkgver=3.4.0 +pkgrel=1 +pkgdesc="The GNOME Bluetooth Subsystem" +arch=('i686' 'x86_64') +url="http://live.gnome.org/GnomeBluetooth" +license=('GPL' 'LGPL') +depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf' 'libnotify') +makedepends=('intltool' 'gnome-doc-utils' 'nautilus-sendto' 'gobject-introspection') +options=('!libtool' '!emptydirs') +install=gnome-bluetooth.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + 61-gnome-bluetooth-rfkill.rules) +sha256sums=('97a229e81997c14064899bdec2a62f94738d00d2f88cc18bcbeb2bdf0610e272' + 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-desktop-update \ + --disable-icon-update \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + install -m644 -D "$srcdir/61-gnome-bluetooth-rfkill.rules" \ + "$pkgdir/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules" +} diff --git a/testing/gnome-bluetooth/gnome-bluetooth.install b/testing/gnome-bluetooth/gnome-bluetooth.install new file mode 100644 index 000000000..8c991877f --- /dev/null +++ b/testing/gnome-bluetooth/gnome-bluetooth.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/gnome-color-manager/PKGBUILD b/testing/gnome-color-manager/PKGBUILD new file mode 100644 index 000000000..d86539c27 --- /dev/null +++ b/testing/gnome-color-manager/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 155099 2012-04-01 11:32:49Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=gnome-color-manager +pkgver=3.4.0 +pkgrel=2 +pkgdesc="Color profile manager for the GNOME desktop" +arch=(i686 x86_64) +url="http://projects.gnome.org/gnome-color-manager/" +license=(GPL2) +depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' + 'mash' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop') +makedepends=('intltool' 'gtk-doc') +install=gnome-color-manager.install +options=('!libtool' '!emptydirs') +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('fcca7292d14dcffea01463bb24833346b415ee189611821399ca96d6638d812d') + +build(){ + cd $pkgname-$pkgver + + # man pages need docbook-sgml, which we don't have + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-color-manager --disable-static --disable-man-pages + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/gnome-color-manager/gnome-color-manager.install b/testing/gnome-color-manager/gnome-color-manager.install new file mode 100644 index 000000000..04fda0ddc --- /dev/null +++ b/testing/gnome-color-manager/gnome-color-manager.install @@ -0,0 +1,19 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall gnome-color-manager + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gnome-contacts/PKGBUILD b/testing/gnome-contacts/PKGBUILD new file mode 100644 index 000000000..f9867b0b7 --- /dev/null +++ b/testing/gnome-contacts/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 155102 2012-04-01 11:32:53Z heftig $ +# Maintainer: Ionut Biru + +pkgname=gnome-contacts +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Contacts Manager for GNOME" +arch=(i686 x86_64) +url="http://www.gnome.org" +license=('GPL2') +groups=(gnome-extra) +depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop') +makedepends=('intltool' 'vala') +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('06d4d8fc22d72f67296ed98d35e3ee40f26d8344bcbd14affff4a720047ccd97') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/gnome-contacts/gnome-contacts.install b/testing/gnome-contacts/gnome-contacts.install new file mode 100644 index 000000000..326aa98a2 --- /dev/null +++ b/testing/gnome-contacts/gnome-contacts.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gnome-control-center/PKGBUILD b/testing/gnome-control-center/PKGBUILD new file mode 100644 index 000000000..8153aad07 --- /dev/null +++ b/testing/gnome-control-center/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 155104 2012-04-01 11:32:56Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=gnome-control-center +pkgver=3.4.0 +pkgrel=2 +pkgdesc="The Control Center for GNOME" +arch=('i686' 'x86_64') +depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' + 'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3' + 'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower' + 'libsystemd' 'cheese') +optdepends=('mesa-demos: provides glxinfo for graphics information' + 'apg: adds password generation for user accounts' + 'gnome-color-manager: for color management tasks') +makedepends=('gnome-doc-utils' 'intltool' 'gnome-common') +url="http://www.gnome.org" +groups=('gnome') +install=gnome-control-center.install +license=('GPL') +options=('!libtool' '!emptydirs') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + systemd-fallback.patch) +sha256sums=('09dafad9afbb6e01bd29dd9186e990545ad58ede3873ba7eff7009c6ffddb254' + '5fa706de582228df36dfc13eb37470e543b2f228f1fc4ad27e35a781a8779b39') + +build() { + cd $pkgname-$pkgver + + patch -Np1 -i ../systemd-fallback.patch + gnome-autogen.sh --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-systemd --with-libsocialweb \ + --disable-update-mimedb + + #https://bugzilla.gnome.org/show_bug.cgi?id=656229 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make +} + +package() { + cd $pkgname-$pkgver + + make DESTDIR="$pkgdir" install +} diff --git a/testing/gnome-control-center/gnome-control-center.install b/testing/gnome-control-center/gnome-control-center.install new file mode 100644 index 000000000..079e0fa34 --- /dev/null +++ b/testing/gnome-control-center/gnome-control-center.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/gnome-control-center/systemd-fallback.patch b/testing/gnome-control-center/systemd-fallback.patch new file mode 100644 index 000000000..709e54019 --- /dev/null +++ b/testing/gnome-control-center/systemd-fallback.patch @@ -0,0 +1,81 @@ +commit 9873a7536844f5c38c2a123be58175c2774e5dcc +Author: Jan Alexander Steffens (heftig) +Date: Mon Mar 12 01:12:11 2012 +0100 + + Fallback to CK if systemd is not available + + Be nice to distributions where systemd is optional. This will select + the code path at runtime depending on whether the system was booted + using systemd. + +diff --git a/configure.ac b/configure.ac +index aee97ac..867f061 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -56,7 +56,7 @@ AC_ARG_ENABLE([systemd], + [with_systemd=$enableval], + [with_systemd=no]) + if test "$with_systemd" = "yes" ; then +- SYSTEMD=libsystemd-login ++ SYSTEMD="libsystemd-login libsystemd-daemon" + AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available]) + else + SYSTEMD= +diff --git a/panels/user-accounts/um-user.c b/panels/user-accounts/um-user.c +index f027754..5ebbe29 100644 +--- a/panels/user-accounts/um-user.c ++++ b/panels/user-accounts/um-user.c +@@ -37,6 +37,11 @@ + + #include + ++#ifdef HAVE_SYSTEMD ++# include ++# include ++#endif ++ + #include "um-user.h" + #include "um-account-type.h" + #include "um-utils.h" +@@ -1003,25 +1008,18 @@ um_user_set_password (UmUser *user, + } + } + +-#ifdef HAVE_SYSTEMD +- +-#include +- + gboolean + um_user_is_logged_in (UmUser *user) + { +- int n_sessions; +- +- n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0; +- +- return n_sessions > 0; +-} ++#ifdef HAVE_SYSTEMD ++ if (sd_booted () > 0) { ++ int n_sessions; + +-#else ++ n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL); + +-gboolean +-um_user_is_logged_in (UmUser *user) +-{ ++ return n_sessions > 0; ++ } ++#endif + GVariant *result; + GVariantIter *iter; + gint n_sessions; +@@ -1052,8 +1050,6 @@ um_user_is_logged_in (UmUser *user) + return n_sessions > 0; + } + +-#endif +- + void + um_user_set_automatic_login (UmUser *user, + gboolean enabled) diff --git a/testing/gnome-desktop/PKGBUILD b/testing/gnome-desktop/PKGBUILD new file mode 100644 index 000000000..1c32892a0 --- /dev/null +++ b/testing/gnome-desktop/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 155106 2012-04-01 11:32:58Z heftig $ +# Maintainer: Jan de Groot + +pkgname=gnome-desktop +pkgver=3.4.0 +pkgrel=1 +epoch=1 +pkgdesc="Library with common API for various GNOME modules" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +depends=('gsettings-desktop-schemas' 'gtk3') +makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection') +url="http://www.gnome.org" +groups=('gnome') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('8b162ca977075c1dd806feef24e9db7ee0cbe42c0ef8d3fbc386265dcea2b08c') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --with-gnome-distributor="Arch Linux" + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/gnome-dictionary/PKGBUILD b/testing/gnome-dictionary/PKGBUILD new file mode 100644 index 000000000..e528515c9 --- /dev/null +++ b/testing/gnome-dictionary/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 155108 2012-04-01 11:33:02Z heftig $ +# Maintainer: Ionut Biru +pkgname=gnome-dictionary +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Look up words in dictionary sources" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('dconf' 'gtk3') +makedepends=('intltool' 'gnome-doc-utils') +install=$pkgname.install +options=(!libtool) +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('70a15987617f5ae39f1fc27f7ed0a039193b4704cef7b89ed3aea30ac38f56af') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/gnome-dictionary/gnome-dictionary.install b/testing/gnome-dictionary/gnome-dictionary.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/testing/gnome-dictionary/gnome-dictionary.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gnome-disk-utility/PKGBUILD b/testing/gnome-disk-utility/PKGBUILD new file mode 100644 index 000000000..fd303dd7c --- /dev/null +++ b/testing/gnome-disk-utility/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 155110 2012-04-01 11:33:04Z heftig $ +# Maintainer: Jan de Groot +# Contributor: Silvio Knizek (killermoehre) + +pkgname=gnome-disk-utility +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Disk Management Utility for GNOME" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org" +groups=('gnome-extra') +depends=('gtk3' 'udisks2' 'hicolor-icon-theme') +makedepends=('intltool') +options=('!libtool' '!emptydirs') +install=gnome-disk-utility.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('1d5b7ba73ee2b5373ea8a087902ab05339723c72eab278670856375280e02f03') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc + + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/gnome-disk-utility/gnome-disk-utility.install b/testing/gnome-disk-utility/gnome-disk-utility.install new file mode 100644 index 000000000..71d138f2d --- /dev/null +++ b/testing/gnome-disk-utility/gnome-disk-utility.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gnome-documents/PKGBUILD b/testing/gnome-documents/PKGBUILD new file mode 100644 index 000000000..024b7b6dc --- /dev/null +++ b/testing/gnome-documents/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 155112 2012-04-01 11:33:07Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=gnome-documents +pkgver=0.4.0.1 +pkgrel=1 +pkgdesc="Documents Manager for GNOME" +arch=(i686 x86_64) +url="http://www.gnome.org" +license=('GPL') +groups=('gnome-extra') +depends=('clutter-gtk' 'evince' 'gjs' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata' 'tracker') +makedepends=('intltool') +optdepends=('unoconv: Support for Libreoffice document types') +options=('!libtool') +install=gnome-documents.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('91e9051b0453fbf271c2a9bc4f40789ea47da5c5269689e2e6897eb1d30621ca') + +build() { + cd $pkgname-$pkgver + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-documents + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/gnome-documents/gnome-documents.install b/testing/gnome-documents/gnome-documents.install new file mode 100644 index 000000000..1571179ca --- /dev/null +++ b/testing/gnome-documents/gnome-documents.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gnome-font-viewer/PKGBUILD b/testing/gnome-font-viewer/PKGBUILD new file mode 100644 index 000000000..b1d751257 --- /dev/null +++ b/testing/gnome-font-viewer/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 155114 2012-04-01 11:33:10Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=gnome-font-viewer +pkgver=3.4.0 +pkgrel=1 +pkgdesc="GNOME font viewer and thumbnailer" +arch=(i686 x86_64) +license=('GPL') +depends=('gtk3' 'desktop-file-utils') +makedepends=('intltool') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +groups=('gnome-extra') +install=gnome-font-viewer.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('6311fc6e390b7ddfde4fbe5954452d0846a0b3991e9e52f179be3969e6033a76') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/gnome-font-viewer/gnome-font-viewer.install b/testing/gnome-font-viewer/gnome-font-viewer.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/testing/gnome-font-viewer/gnome-font-viewer.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gnome-games/PKGBUILD b/testing/gnome-games/PKGBUILD new file mode 100644 index 000000000..7c9dec09d --- /dev/null +++ b/testing/gnome-games/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 155116 2012-04-01 11:33:14Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=gnome-games +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Some Games for GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf') +makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala') +options=('!emptydirs' '!libtool') +install=gnome-games.install +url="http://www.gnome.org" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('9dc639e6f16904f7f4df1692630f2ea190f82692afd196b281eebf21b81e0837') + +build() { + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static --disable-schemas-compile \ + --with-scores-user=root --with-scores-group=games \ + --enable-introspection=yes + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + # Remove all scores, we generate them from postinstall + rm -rf "$pkgdir/var" + + sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' "$pkgdir/usr/bin/gnome-sudoku" +} diff --git a/testing/gnome-games/gnome-games.install b/testing/gnome-games/gnome-games.install new file mode 100644 index 000000000..aaa36a896 --- /dev/null +++ b/testing/gnome-games/gnome-games.install @@ -0,0 +1,122 @@ +_scores=(glines.Large.scores + glines.Medium.scores + glines.Small.scores + gnibbles.1.0.scores + gnibbles.1.1.scores + gnibbles.2.0.scores + gnibbles.2.1.scores + gnibbles.3.0.scores + gnibbles.3.1.scores + gnibbles.4.0.scores + gnibbles.4.1.scores + gnobots2.classic_robots-safe.scores + gnobots2.classic_robots-super-safe.scores + gnobots2.classic_robots.scores + gnobots2.nightmare-safe.scores + gnobots2.nightmare-super-safe.scores + gnobots2.nightmare.scores + gnobots2.robots2-safe.scores + gnobots2.robots2-super-safe.scores + gnobots2.robots2.scores + gnobots2.robots2_easy-safe.scores + gnobots2.robots2_easy-super-safe.scores + gnobots2.robots2_easy.scores + gnobots2.robots_with_safe_teleport-safe.scores + gnobots2.robots_with_safe_teleport-super-safe.scores + gnobots2.robots_with_safe_teleport.scores + gnomine.Custom.scores + gnomine.Large.scores + gnomine.Medium.scores + gnomine.Small.scores + gnotravex.2x2.scores + gnotravex.3x3.scores + gnotravex.4x4.scores + gnotravex.5x5.scores + gnotravex.6x6.scores + gnotski.1.scores + gnotski.10.scores + gnotski.11.scores + gnotski.12.scores + gnotski.13.scores + gnotski.14.scores + gnotski.15.scores + gnotski.16.scores + gnotski.17.scores + gnotski.18.scores + gnotski.19.scores + gnotski.2.scores + gnotski.20.scores + gnotski.21.scores + gnotski.22.scores + gnotski.23.scores + gnotski.24.scores + gnotski.25.scores + gnotski.26.scores + gnotski.27.scores + gnotski.28.scores + gnotski.29.scores + gnotski.3.scores + gnotski.30.scores + gnotski.31.scores + gnotski.32.scores + gnotski.33.scores + gnotski.34.scores + gnotski.35.scores + gnotski.36.scores + gnotski.37.scores + gnotski.4.scores + gnotski.5.scores + gnotski.6.scores + gnotski.7.scores + gnotski.8.scores + gnotski.9.scores + gtali.Colors.scores + gtali.Regular.scores + mahjongg.bridges.scores + mahjongg.cloud.scores + mahjongg.confounding.scores + mahjongg.difficult.scores + mahjongg.dragon.scores + mahjongg.easy.scores + mahjongg.pyramid.scores + mahjongg.tictactoe.scores + mahjongg.ziggurat.scores + swell-foop.Large.scores + swell-foop.Medium.scores + swell-foop.Small.scores + quadrapassel.scores) + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + + for score in "${_scores[@]}" ; do + if [ -e "var/games/$score" ]; then + continue + fi + + touch "var/games/$score" + chown root:games "var/games/$score" + chmod 664 "var/games/$score" + done +} + +pre_upgrade() { + (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games + return 0 +} + +post_upgrade() { + post_install +} + +post_remove() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -f -t usr/share/icons/hicolor + + for score in "${_scores[@]}" ; do + rm -f "var/games/$score" + done +} diff --git a/testing/gnome-keyring/PKGBUILD b/testing/gnome-keyring/PKGBUILD new file mode 100644 index 000000000..52d5aa4a1 --- /dev/null +++ b/testing/gnome-keyring/PKGBUILD @@ -0,0 +1,32 @@ +#$Id: PKGBUILD 155121 2012-04-01 11:33:23Z heftig $ +# Maintainer: Jan De Groot + +pkgname=gnome-keyring +pkgver=3.4.0 +pkgrel=1 +pkgdesc="GNOME Password Management daemon" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +depends=('gtk3' 'gcr' 'libcap-ng') +makedepends=('intltool') +groups=('gnome') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +install=gnome-keyring.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('a3ea4ea71cdc5f25a4d72027ea6b775d20d9fead1ac71210d743e4cb2df3c3a2') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gnome-keyring \ + --with-pam-dir=/lib/security --with-root-certs=/etc/ssl/certs \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/gnome-keyring/gnome-keyring.install b/testing/gnome-keyring/gnome-keyring.install new file mode 100644 index 000000000..c351377a2 --- /dev/null +++ b/testing/gnome-keyring/gnome-keyring.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + setcap cap_ipc_lock=ep /usr/bin/gnome-keyring-daemon +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} diff --git a/testing/gnome-media/PKGBUILD b/testing/gnome-media/PKGBUILD new file mode 100644 index 000000000..e9643d858 --- /dev/null +++ b/testing/gnome-media/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 155123 2012-04-01 11:33:25Z heftig $ +# Maintainer: Jan de Groot + +pkgname=gnome-media +pkgver=3.4.0 +pkgrel=1 +pkgdesc="GNOME Media Tools" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libgnome-media-profiles' 'libcanberra' 'hicolor-icon-theme') +makedepends=('intltool' 'gnome-doc-utils') +url="http://www.gnome.org" +groups=('gnome-extra') +options=('!libtool' '!emptydirs') +install=gnome-media.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('a76fac286f24d3836137ddbaab66f05e19eb5fb83cca6e375dbef040765a1d1f') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gnome-media \ + --localstatedir=/var --disable-static \ + --disable-scrollkeeper + 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/${pkgbase}.schemas" --domain gnome-media-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + + rm -rf "${pkgdir}/usr/share/sounds/" +} diff --git a/testing/gnome-media/gnome-media.install b/testing/gnome-media/gnome-media.install new file mode 100644 index 000000000..97488b6d0 --- /dev/null +++ b/testing/gnome-media/gnome-media.install @@ -0,0 +1,22 @@ +pkgname=gnome-media + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} diff --git a/testing/gnome-menus/PKGBUILD b/testing/gnome-menus/PKGBUILD new file mode 100644 index 000000000..d3bb73105 --- /dev/null +++ b/testing/gnome-menus/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 155125 2012-04-01 11:33:28Z heftig $ +# Maintainer: Jan de Groot + +pkgname=gnome-menus +pkgver=3.4.0 +pkgrel=1 +pkgdesc="GNOME menu specifications" +arch=('i686' 'x86_64') +depends=('glib2' 'python2-gobject') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool') +license=('GPL' 'LGPL') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + menus.patch) +sha256sums=('199ce6bce3e24cbab8aed7f3488e7557a8f365314eae354aa2b50727b2f11f86' + 'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc') + +build() { + cd "$pkgname-$pkgver" + + patch -Np0 -i "$srcdir/menus.patch" + + PYTHON=/usr/bin/python2 ./configure \ + --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package(){ + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + sed -i "1s|#!/usr/bin/env python$|&2|" \ + "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py" +} diff --git a/testing/gnome-menus/menus.patch b/testing/gnome-menus/menus.patch new file mode 100644 index 000000000..bf73e86cd --- /dev/null +++ b/testing/gnome-menus/menus.patch @@ -0,0 +1,25 @@ +--- layout/applications.menu 2005-06-28 10:16:39.000000000 +0200 ++++ layout/applications.menu 2005-09-12 23:21:20.000000000 +0200 +@@ -7,7 +7,6 @@ + Applications.directory + + +- + /etc/X11/applnk + /usr/share/gnome/apps + +@@ -18,6 +17,14 @@ + + + ++ ++

++ Archlinux ++ Archlinux.directory ++ ++ Archlinux ++ ++ + + + Accessories diff --git a/testing/gnome-nettool/PKGBUILD b/testing/gnome-nettool/PKGBUILD new file mode 100644 index 000000000..06c623f71 --- /dev/null +++ b/testing/gnome-nettool/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 155127 2012-04-01 11:33:32Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot +# Contributor: Kritoke + +pkgname=gnome-nettool +pkgver=3.1.1 +pkgrel=1 +pkgdesc="A Collection of GNOME3 Networking Tools." +arch=(i686 x86_64) +license=('GPL') +depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'nmap' 'netkit-bsd-finger' 'whois' 'hicolor-icon-theme') +makedepends=('gnome-doc-utils' 'intltool') +groups=('gnome-extra') +url="http://www.gnome.org" +install=gnome-nettool.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('1e0430c94084484f234864c160e6252552d54bb72c163d3e451641045429901c') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/gnome-nettool/gnome-nettool.install b/testing/gnome-nettool/gnome-nettool.install new file mode 100644 index 000000000..e5dfaf4a5 --- /dev/null +++ b/testing/gnome-nettool/gnome-nettool.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install +} diff --git a/testing/gnome-online-accounts/PKGBUILD b/testing/gnome-online-accounts/PKGBUILD new file mode 100644 index 000000000..5f3e6db28 --- /dev/null +++ b/testing/gnome-online-accounts/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 155129 2012-04-01 11:33:35Z heftig $ +# Maintainer: Ionut Biru + +pkgname=gnome-online-accounts +pkgver=3.4.0 +pkgrel=1 +pkgdesc="GNOME service to access online accounts" +arch=(i686 x86_64) +url="http://www.gnome.org" +license=('GPL') +depends=('libwebkit3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme') +makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') +options=(!libtool) +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('306a6ebaf4a0349596d1729d263b98fdb8d27d788d61e27d727d03883dccea95') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/gnome-online-accounts/gnome-online-accounts.install b/testing/gnome-online-accounts/gnome-online-accounts.install new file mode 100644 index 000000000..525ecff63 --- /dev/null +++ b/testing/gnome-online-accounts/gnome-online-accounts.install @@ -0,0 +1,11 @@ +post_install () { + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gnome-panel/PKGBUILD b/testing/gnome-panel/PKGBUILD new file mode 100644 index 000000000..4d30e1017 --- /dev/null +++ b/testing/gnome-panel/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 155131 2012-04-01 11:33:37Z heftig $ +# Maintainer: Jan de Groot + +pkgname=gnome-panel +pkgver=3.4.0 +pkgrel=1 +arch=('i686' 'x86_64') +license=('GPL') +pkgdesc="The GNOME Panel" +url="http://www.gnome.org" +depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf' 'telepathy-glib') +makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra') +install=gnome-panel.install +groups=('gnome') +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('70020645ecac8f54164454e6d413b62183d58372a8d10d2b072fee69eb11fd91') + +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/testing/gnome-panel/gnome-panel.install b/testing/gnome-panel/gnome-panel.install new file mode 100644 index 000000000..0f9324937 --- /dev/null +++ b/testing/gnome-panel/gnome-panel.install @@ -0,0 +1,24 @@ +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/testing/gnome-power-manager/PKGBUILD b/testing/gnome-power-manager/PKGBUILD new file mode 100644 index 000000000..4d0c4af04 --- /dev/null +++ b/testing/gnome-power-manager/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 155133 2012-04-01 11:33:41Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=gnome-power-manager +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Power management tools." +arch=(i686 x86_64) +url="http://www.gnome.org/projects/gnome-power-manager/" +license=('GPL') +depends=('gtk3' 'upower' 'dconf' 'hicolor-icon-theme') +makedepends=('intltool') +options=(!emptydirs) +install=gnome-power-manager.install +groups=(gnome-extra) +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('2c47786a1ed85b6ba48ad5e74e2584ab7cbc0127fda46359ec4671b1c0286c71') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-power-manager \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/gnome-power-manager/gnome-power-manager.install b/testing/gnome-power-manager/gnome-power-manager.install new file mode 100644 index 000000000..f7e8c46ac --- /dev/null +++ b/testing/gnome-power-manager/gnome-power-manager.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gnome-screensaver/PKGBUILD b/testing/gnome-screensaver/PKGBUILD new file mode 100644 index 000000000..f840750c0 --- /dev/null +++ b/testing/gnome-screensaver/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 155135 2012-04-01 11:33:44Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=gnome-screensaver +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Screensaver designed to integrate well with the GNOME desktop." +arch=('i686' 'x86_64') +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=('8d73e687f41975d66ee1fa56986d901a0bbdf4094f429cdbbed4a19016a38974' + '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 "${srcdir}/gnome-screensaver.pam" "${pkgdir}/etc/pam.d/gnome-screensaver" +} diff --git a/testing/gnome-screensaver/gnome-screensaver.install b/testing/gnome-screensaver/gnome-screensaver.install new file mode 100644 index 000000000..3b0e06046 --- /dev/null +++ b/testing/gnome-screensaver/gnome-screensaver.install @@ -0,0 +1,7 @@ +pkgname=gnome-screensaver + +pre_upgrade() { + if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then + usr/sbin/gconfpkg --uninstall ${pkgname} + fi +} diff --git a/testing/gnome-screensaver/gnome-screensaver.pam b/testing/gnome-screensaver/gnome-screensaver.pam new file mode 100644 index 000000000..453dae646 --- /dev/null +++ b/testing/gnome-screensaver/gnome-screensaver.pam @@ -0,0 +1,3 @@ +#%PAM-1.0 +auth required pam_unix_auth.so nullok +auth optional pam_gnome_keyring.so diff --git a/testing/gnome-screenshot/PKGBUILD b/testing/gnome-screenshot/PKGBUILD new file mode 100644 index 000000000..48e99f8d3 --- /dev/null +++ b/testing/gnome-screenshot/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 155137 2012-04-01 11:33:47Z heftig $ +# Maintainer: Ionut Biru + +pkgname=gnome-screenshot +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Take pictures of your screen" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('dconf' 'gtk3' 'libcanberra') +makedepends=('intltool') +groups=('gnome-extra') +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('0d04ffdc927557745de03aeef84924b43f3469a445e0afc8ef6050834898ad9c') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/gnome-screenshot/gnome-screenshot.install b/testing/gnome-screenshot/gnome-screenshot.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/testing/gnome-screenshot/gnome-screenshot.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gnome-search-tool/PKGBUILD b/testing/gnome-search-tool/PKGBUILD new file mode 100644 index 000000000..adbd25293 --- /dev/null +++ b/testing/gnome-search-tool/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 155139 2012-04-01 11:33:50Z heftig $ +# Maintainer: Ionut Biru + +pkgname=gnome-search-tool +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Utility to search for files" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('gconf' 'gtk3' 'libsm') +makedepends=('intltool' 'gnome-doc-utils') +install=$pkgname.install +options=('!emptydirs') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('6c4ed39ab1196d118e5e0d2a7faa07fbbb257831454ee92ff0c6f28c0942e69c') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-schemas-install + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + install -m755 -d "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain $pkgname "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/gnome-search-tool/gnome-search-tool.install b/testing/gnome-search-tool/gnome-search-tool.install new file mode 100644 index 000000000..9bc909b92 --- /dev/null +++ b/testing/gnome-search-tool/gnome-search-tool.install @@ -0,0 +1,17 @@ +pkgname=gnome-search-tool + +post_install() { + gconfpkg --install $pkgname +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + gconfpkg --uninstall $pkgname +} diff --git a/testing/gnome-session/PKGBUILD b/testing/gnome-session/PKGBUILD new file mode 100644 index 000000000..067c03369 --- /dev/null +++ b/testing/gnome-session/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 155141 2012-04-01 11:33:53Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=gnome-session +pkgver=3.4.0 +pkgrel=1 +pkgdesc="The GNOME Session Handler" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +depends=('libsystemd' 'consolekit' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3' + 'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome' + 'startup-notification' 'upower') +makedepends=('intltool' 'mesa' 'xtrans') +options=('!emptydirs') +install=gnome-session.install +url="http://www.gnome.org" +groups=('gnome') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('bf8ba2ba9d61ad680df9e66ca38f05d6e3bf00c65634bb0dc5e41690862608e1') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --libexecdir=/usr/lib/gnome-session \ + --disable-schemas-compile --enable-systemd + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/gnome-session/gnome-session.install b/testing/gnome-session/gnome-session.install new file mode 100644 index 000000000..f7e8c46ac --- /dev/null +++ b/testing/gnome-session/gnome-session.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gnome-settings-daemon/PKGBUILD b/testing/gnome-settings-daemon/PKGBUILD new file mode 100644 index 000000000..18162a417 --- /dev/null +++ b/testing/gnome-settings-daemon/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 155143 2012-04-01 11:33:56Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=gnome-settings-daemon +pkgver=3.4.0 +pkgrel=1 +pkgdesc="The GNOME Settings daemon" +arch=('i686' 'x86_64') +license=('GPL') +depends=('colord' 'dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libgnomekbd' 'libnotify' + 'libsystemd' 'libwacom' 'nss' 'pulseaudio' 'pulseaudio-alsa' 'upower') +makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom') +options=('!emptydirs' '!libtool') +install=gnome-settings-daemon.install +url="http://www.gnome.org" +groups=('gnome') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + systemd-fallback.patch) +sha256sums=('5639cbba28caa7b3e33990f49aeed11ed9325e78e76af2175d9ccd5ff298401d' + '3af86d4b341d5ca7c94cc814b250b122309d38f48be0bf0581d0c77e763a8008') + +build() { + cd $pkgname-$pkgver + + patch -Np1 -i ../systemd-fallback.patch + gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \ + --enable-systemd + + #https://bugzilla.gnome.org/show_bug.cgi?id=656231 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/gnome-settings-daemon/gnome-settings-daemon.install b/testing/gnome-settings-daemon/gnome-settings-daemon.install new file mode 100644 index 000000000..f7e8c46ac --- /dev/null +++ b/testing/gnome-settings-daemon/gnome-settings-daemon.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gnome-settings-daemon/systemd-fallback.patch b/testing/gnome-settings-daemon/systemd-fallback.patch new file mode 100644 index 000000000..da0496623 --- /dev/null +++ b/testing/gnome-settings-daemon/systemd-fallback.patch @@ -0,0 +1,154 @@ +commit b9ded09387f0b99ece97baee18595eb9e86a5b9b +Author: Jan Alexander Steffens (heftig) +Date: Mon Mar 12 01:52:54 2012 +0100 + + Fallback to CK if systemd is not available + + Be nice to distributions where systemd is optional. This will select + the code path at runtime depending on whether the system was booted + using systemd. + +diff --git a/configure.ac b/configure.ac +index 3b4789f..d522852 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -299,7 +299,7 @@ AC_ARG_ENABLE([systemd], + [with_systemd=$enableval], + [with_systemd=no]) + if test "$with_systemd" = "yes" ; then +- PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login]) ++ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login]) + AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking]) + SESSION_TRACKING=systemd + else +diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-session.c +index 5786300..83fe21e 100644 +--- a/gnome-settings-daemon/gnome-settings-session.c ++++ b/gnome-settings-daemon/gnome-settings-session.c +@@ -30,6 +30,7 @@ + #include "gnome-settings-session.h" + + #ifdef HAVE_SYSTEMD ++#include + #include + + typedef struct +@@ -130,10 +131,9 @@ struct GnomeSettingsSessionPrivate + { + #ifdef HAVE_SYSTEMD + GSource *sd_source; +-#else ++#endif + GDBusProxy *proxy_session; + GCancellable *cancellable; +-#endif + gchar *session_id; + GnomeSettingsSessionState state; + }; +@@ -237,7 +237,7 @@ sessions_changed (gpointer user_data) + return TRUE; + } + +-#else /* HAVE_SYSTEMD */ ++#endif /* HAVE_SYSTEMD */ + + static void + gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy, +@@ -371,22 +371,25 @@ got_manager_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_d + g_object_unref (proxy_manager); + } + +-#endif /* HAVE_SYSTEMD */ +- + static void + gnome_settings_session_init (GnomeSettingsSession *session) + { + session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session); + + #ifdef HAVE_SYSTEMD +- sd_pid_get_session (getpid(), &session->priv->session_id); ++ session->priv->sd_source = NULL; ++ ++ if (sd_booted () > 0) { ++ sd_pid_get_session (getpid(), &session->priv->session_id); + +- session->priv->sd_source = sd_source_new (); +- g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); +- g_source_attach (session->priv->sd_source, NULL); ++ session->priv->sd_source = sd_source_new (); ++ g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); ++ g_source_attach (session->priv->sd_source, NULL); + +- sessions_changed (session); +-#else ++ sessions_changed (session); ++ return; ++ } ++#endif + session->priv->cancellable = g_cancellable_new (); + + /* connect to ConsoleKit */ +@@ -399,7 +402,6 @@ gnome_settings_session_init (GnomeSettingsSession *session) + session->priv->cancellable, + got_manager_proxy_cb, + session); +-#endif + } + + static void +@@ -415,15 +417,17 @@ gnome_settings_session_finalize (GObject *object) + if (session->priv->sd_source != NULL) { + g_source_destroy (session->priv->sd_source); + g_source_unref (session->priv->sd_source); ++ goto out; + } +-#else ++#endif ++ + g_cancellable_cancel (session->priv->cancellable); + + if (session->priv->proxy_session != NULL) + g_object_unref (session->priv->proxy_session); + g_object_unref (session->priv->cancellable); +-#endif + ++out: + G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object); + } + +diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c +index 8db04e5..9883d76 100644 +--- a/plugins/power/gsd-power-manager.c ++++ b/plugins/power/gsd-power-manager.c +@@ -2031,7 +2031,7 @@ systemd_stop (void) + g_object_unref (bus); + } + +-#else ++#endif + + static void + consolekit_stop_cb (GObject *source_object, +@@ -2081,7 +2081,6 @@ consolekit_stop (void) + consolekit_stop_cb, NULL); + g_object_unref (proxy); + } +-#endif + + static void + upower_sleep_cb (GObject *source_object, +@@ -2135,10 +2134,11 @@ do_power_action_type (GsdPowerManager *manager, + * hibernate is not available and is marginally better + * than just powering down the computer mid-write */ + #ifdef HAVE_SYSTEMD +- systemd_stop (); +-#else +- consolekit_stop (); ++ if (sd_booted () > 0) ++ systemd_stop (); ++ else + #endif ++ consolekit_stop (); + break; + case GSD_POWER_ACTION_BLANK: + ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, diff --git a/testing/gnome-shell/PKGBUILD b/testing/gnome-shell/PKGBUILD new file mode 100644 index 000000000..436d68b72 --- /dev/null +++ b/testing/gnome-shell/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 155145 2012-04-01 11:33:58Z heftig $ +# Maintainer: Ionut Biru +# Contributor: Flamelab + +pkgname=gnome-system-log +pkgver=3.4.0 +pkgrel=1 +pkgdesc="View your system logs" +arch=(i686 x86_64) +url="http://gnome.org" +license=('GPL2') +depends=('dconf' 'gtk3') +makedepends=('intltool' 'gnome-doc-utils') +groups=('gnome-extra') +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('7eea66e1cef32c0ad7f0027564d371123dfbfb1866fd172d9d498b5dd701528b') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/gnome-system-log/gnome-system-log.install b/testing/gnome-system-log/gnome-system-log.install new file mode 100644 index 000000000..847019792 --- /dev/null +++ b/testing/gnome-system-log/gnome-system-log.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gnome-system-monitor/PKGBUILD b/testing/gnome-system-monitor/PKGBUILD new file mode 100644 index 000000000..8a8f6cffb --- /dev/null +++ b/testing/gnome-system-monitor/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 155149 2012-04-01 11:34:05Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=gnome-system-monitor +pkgver=3.4.0 +pkgrel=1 +pkgdesc="A system monitor for GNOME" +arch=(i686 x86_64) +license=('GPL') +depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'libsystemd') +makedepends=('pkgconfig' 'gnome-doc-utils' 'intltool') +options=(!emptydirs) +url="http://www.gnome.org" +groups=('gnome-extra') +install=gnome-system-monitor.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('e62047983f423f4a178f01d860e9b362e8c9757d4bbeadad0f261b97b4433d12') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/gnome-system-monitor/gnome-system-monitor.install b/testing/gnome-system-monitor/gnome-system-monitor.install new file mode 100644 index 000000000..70641526f --- /dev/null +++ b/testing/gnome-system-monitor/gnome-system-monitor.install @@ -0,0 +1,19 @@ +pkgname=gnome-system-monitor + +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +pre_upgrade() { + if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then + gconfpkg --uninstall ${pkgname} + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/gnome-terminal/PKGBUILD b/testing/gnome-terminal/PKGBUILD new file mode 100644 index 000000000..2d49daed6 --- /dev/null +++ b/testing/gnome-terminal/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 155151 2012-04-01 11:34:08Z heftig $ +# Maintainer: Jan de Groot + +pkgname=gnome-terminal +pkgver=3.4.0.1 +pkgrel=1 +pkgdesc="The GNOME Terminal Emulator" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm') +makedepends=('gnome-doc-utils' 'intltool' 'gtk2') +options=('!emptydirs') +url="http://www.gnome.org" +groups=('gnome') +install=gnome-terminal.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('1369298498d62993b075dc6d4b9669bbce1acb7ba1f670a0ba39e40a2a25a092') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-scrollkeeper + 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-terminal "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas +} diff --git a/testing/gnome-terminal/gnome-terminal.install b/testing/gnome-terminal/gnome-terminal.install new file mode 100644 index 000000000..1d8510f06 --- /dev/null +++ b/testing/gnome-terminal/gnome-terminal.install @@ -0,0 +1,17 @@ +pkgname=gnome-terminal + +post_install() { + gconfpkg --install $pkgname +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + gconfpkg --uninstall $pkgname +} diff --git a/testing/gnome-themes-standard/PKGBUILD b/testing/gnome-themes-standard/PKGBUILD new file mode 100644 index 000000000..8316c93e7 --- /dev/null +++ b/testing/gnome-themes-standard/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 155153 2012-04-01 11:34:10Z heftig $ +# Maintainer: Jan "heftig" Steffens + +pkgname=gnome-themes-standard +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Default themes for the GNOME desktop" +arch=('i686' 'x86_64') +url="http://www.gnome.org" +license=('GPL2') +depends=('cantarell-fonts' 'ttf-dejavu' 'gtk3' 'gtk-engines' 'librsvg') +makedepends=('intltool') +groups=('gnome') +replaces=('gnome-themes') +conflicts=('gnome-themes') +options=('!libtool') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('6c85056db16b748a14c412554371a22f096b981d2eca3ae3d6922a435d43b0fd') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/gnome-user-share/PKGBUILD b/testing/gnome-user-share/PKGBUILD new file mode 100644 index 000000000..b5a606720 --- /dev/null +++ b/testing/gnome-user-share/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 155157 2012-04-01 11:34:17Z heftig $ +# Maintainer: Roman Kyrylych + +pkgname=gnome-user-share +pkgver=3.0.2 +pkgrel=1 +pkgdesc="Easy to use user-level file sharing for GNOME." +arch=('i686' 'x86_64') +url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/" +license=('GPL') +depends=('mod_dnssd' 'gconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra') +makedepends=('intltool' 'gnome-doc-utils' 'nautilus') +options=('!emptydirs' '!libtool') +install=gnome-user-share.install +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('34a5b6e340025e8466233f374898a6e293839f6785c0abf14eed86d1f3d22ffd') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gnome-user-share \ + --localstatedir=/var + make +} + +package() { + cd "${srcdir}/${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-user-share ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/testing/gnome-user-share/gnome-user-share.install b/testing/gnome-user-share/gnome-user-share.install new file mode 100644 index 000000000..3cc1b5286 --- /dev/null +++ b/testing/gnome-user-share/gnome-user-share.install @@ -0,0 +1,22 @@ +pkgname=gnome-user-share + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/testing/gobject-introspection/PKGBUILD b/testing/gobject-introspection/PKGBUILD new file mode 100644 index 000000000..58b78d24a --- /dev/null +++ b/testing/gobject-introspection/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 155161 2012-04-01 11:34:23Z heftig $ +# Maintainer: Jan de Groot + +pkgname=gobject-introspection +pkgver=1.32.0 +pkgrel=1 +pkgdesc="Introspection system for GObject-based libraries" +url="http://live.gnome.org/GObjectInstrospection" +arch=('x86_64' 'i686') +license=('LGPL' 'GPL') +depends=('glib2' 'python2') +makedepends=('cairo') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('346a729eb8a2a5dc49197d2195e71295167504cc2671298dfd92a32f8e5a01b3') + +build() { + cd "$srcdir/$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + sed -i '1s|#!/usr/bin/env python$|&2|' \ + "$pkgdir"/usr/lib/gobject-introspection/giscanner/*.py +} diff --git a/testing/gpsd/PKGBUILD b/testing/gpsd/PKGBUILD new file mode 100644 index 000000000..254bcb281 --- /dev/null +++ b/testing/gpsd/PKGBUILD @@ -0,0 +1,78 @@ +# $Id: PKGBUILD 155323 2012-04-01 19:53:02Z tomegun $ +# Maintainer: +# Contributor: Andrea Scarpino +# Contributor: Sergej Pupykin +# Contributor: Giacomo Rizzo + +pkgname=gpsd +pkgver=3.4 +pkgrel=2 +pkgdesc="GPS daemon and library to support USB/serial GPS devices" +arch=('i686' 'x86_64') +url="http://catb.org/gpsd/" +license=('BSD') +depends=('python2' 'libusb' 'bluez' 'desktop-file-utils') +optdepends=('php: generate a PHP status page for your GPS' + 'php-gd: image support for the PHP status page' + 'pygtk: GUI frontends') +makedepends=('scons' 'docbook-xsl' 'chrpath') +backup=('etc/conf.d/gpsd') +options=('!libtool') +install="${pkgname}.install" +source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} + 'gpsd' 'gpsd.conf.d') +md5sums=('c01353459faa68834309109d4e868460' + '8aea27e1b0c23f254f94861f7d898106' + '1f3402f8e33a7032b9ae6dfd077234f7' + '3e963df3f9f7ef3572ecc648ae829315') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # fix python 2.7 path + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find . -name '*.py') + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gegps \ + gpscat gpsfake gpsprof xgps xgpsspeed + + scons prefix=/usr \ + systemd=yes \ + libQgpsmm=no \ + PYTHONPATH=/usr/bin/python2 + scons build +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Fix man pages path (FS#21715) + sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1 + + export DESTDIR="${pkgdir}" + scons install + + install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd" + + install -D -m644 "gpsd.rules" "${pkgdir}/usr/lib/udev/rules.d/99-gpsd-usb.rules" + + sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug + install -D -m755 gpsd.hotplug "${pkgdir}/usr/lib/udev/gpsd.hotplug" + + # GPSD needs RPATH + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0 + chrpath -r /usr/lib/ "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps} + chrpath -r /usr/lib/ "${pkgdir}"/usr/sbin/{gpsd,gpsdctl} + chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/gps/{clienthelpers,packet}.so + + install -D -m644 packaging/X11/xgps.desktop \ + "${pkgdir}/usr/share/applications/xgps.desktop" + install -D -m644 packaging/X11/xgpsspeed.desktop \ + "${pkgdir}/usr/share/applications/xgpsspeed.desktop" + install -D -m644 packaging/X11/gpsd-logo.png \ + "${pkgdir}/usr/share/gpsd/gpsd-logo.png" + + install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd" + + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/gpsd/gpsd b/testing/gpsd/gpsd new file mode 100755 index 000000000..b510a7542 --- /dev/null +++ b/testing/gpsd/gpsd @@ -0,0 +1,44 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +[ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd + +NAME=gpsd +DAEMON=/usr/sbin/$NAME +PIDFILE=/var/run/$NAME/$NAME.pid +PID=$(cat $PIDFILE 2>/dev/null) + +case "$1" in + start) + stat_busy "Starting $NAME" + [ ! -d /var/run/$NAME ] && install -d /var/run/$NAME + [ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /var/run/$NAME/$NAME.sock ${GPSD_OPTIONS} ${DEVICES} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon $NAME + stat_done + fi + ;; + stop) + stat_busy "Stopping $NAME" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f $PIDFILE &>/dev/null + rm_daemon $NAME + stat_done + fi + ;; + + restart) + $0 stop + sleep 2 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/testing/gpsd/gpsd.conf.d b/testing/gpsd/gpsd.conf.d new file mode 100644 index 000000000..9fef72cb9 --- /dev/null +++ b/testing/gpsd/gpsd.conf.d @@ -0,0 +1,5 @@ +# Default settings for gpsd. +START_DAEMON="true" +GPSD_OPTIONS="" +DEVICES="" +USBAUTO="true" diff --git a/testing/gpsd/gpsd.install b/testing/gpsd/gpsd.install new file mode 100644 index 000000000..ee661fcb1 --- /dev/null +++ b/testing/gpsd/gpsd.install @@ -0,0 +1,16 @@ +post_install() { + echo ">>> Note: the supplied gpsd udev rules are device-specific, so" + echo ">>> if your device isn't detected correctly, please use lsusb or" + echo ">>> another suitable tool to determine the proper device IDs and" + echo ">>> use the commented rules to fill in the blanks for your device." + + update-desktop-database -q +} + +post_upgrade() { + update-desktop-database -q +} + +post_remove() { + update-desktop-database -q +} diff --git a/testing/grilo-plugins/PKGBUILD b/testing/grilo-plugins/PKGBUILD new file mode 100644 index 000000000..dfd01b704 --- /dev/null +++ b/testing/grilo-plugins/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 155163 2012-04-01 11:34:26Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=grilo-plugins +pkgver=0.1.18 +pkgrel=3 +pkgdesc="Plugins for Grilo" +url="http://www.gnome.org" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('grilo') +makedepends=('gupnp-av' 'libgdata' 'libquvi' 'sqlite3' 'gmime' 'libgcrypt' + 'rest' 'libtracker-sparql' 'gnome-common') +optdepends=('gupnp-av: uPnP plugin' + 'libgdata: Youtube plugin' + 'libquvi: Youtube plugin' + 'sqlite3: Podcasts plugin' + 'gmime: Podcasts plugin' + 'sqlite3: Bookmarks plugin' + 'sqlite3: Metadata store plugin' + 'libgcrypt: Vimeo plugin' + 'rest: Blip.tv plugin' + 'libtracker-sparql: Tracker plugin') +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz + tracker-0.14.patch) +sha256sums=('7e382f402119f4f270380627a2f49b30a6c43a47ecd645bf5ffe4e0cd99a1c79' + 'c48201ed1633e2b0eb5132ef823d7b060e9c2cddb808c6981fb546133cd4ea63') + +build() { + cd $pkgname-$pkgver + + patch -Np1 -i ../tracker-0.14.patch + + gnome-autogen.sh --prefix=/usr --sysconfdir=/etc --disable-static \ + --enable-shoutcast + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/grilo-plugins/tracker-0.14.patch b/testing/grilo-plugins/tracker-0.14.patch new file mode 100644 index 000000000..c9c79fe7c --- /dev/null +++ b/testing/grilo-plugins/tracker-0.14.patch @@ -0,0 +1,32 @@ +From 9e00790f40ee498a7359b00e0b11a7523fdd1b3e Mon Sep 17 00:00:00 2001 +From: Vincent Untz +Date: Thu, 19 Jan 2012 09:30:28 +0000 +Subject: build: Support build against tracker 0.13/0.14 + +https://bugzilla.gnome.org/show_bug.cgi?id=667855 +--- +diff --git a/configure.ac b/configure.ac +index 1fd6743..71aceed 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -134,11 +134,17 @@ PKG_CHECK_MODULES(GMIME, gmime-2.6, + HAVE_GMIME=yes, + HAVE_GMIME=no)]) + +-PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.12, ++PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.14, + HAVE_TRACKER_SPARQL=yes, + HAVE_TRACKER_SPARQL=no) + + if test "x$HAVE_TRACKER_SPARQL" = "xno"; then ++ PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.12, ++ HAVE_TRACKER_SPARQL=yes, ++ HAVE_TRACKER_SPARQL=no) ++fi ++ ++if test "x$HAVE_TRACKER_SPARQL" = "xno"; then + PKG_CHECK_MODULES(TRACKER_SPARQL, tracker-sparql-0.11, + HAVE_TRACKER_SPARQL=yes, + HAVE_TRACKER_SPARQL=no) +-- +cgit v0.9.0.2 diff --git a/testing/gthumb/PKGBUILD b/testing/gthumb/PKGBUILD new file mode 100644 index 000000000..bac40a902 --- /dev/null +++ b/testing/gthumb/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 155166 2012-04-01 11:34:32Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot +# Contributor: Tobias Kieslich + +pkgname=gthumb +pkgver=2.90.2 +pkgrel=1 +pkgdesc="Image browser and viewer for the GNOME Desktop" +arch=(i686 x86_64) +license=('GPL') +url="http://live.gnome.org/gthumb" +depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk' + 'gstreamer0.10-base') +makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome' + 'brasero' 'librsvg' 'libopenraw' 'liboauth') +optdepends=('libopenraw: read RAW files' + 'exiv2: metadata support' + 'libchamplain: map viewer' + 'brasero: burn discs' + 'libsoup-gnome: web albums' + 'liboauth: web albums') +options=('!libtool' '!emptydirs') +install=gthumb.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('29a961ede929c172723cb5550977e4bf7cda4921228ed1ddafba09cc6bae4424') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-libchamplain --enable-libopenraw + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/gthumb/gthumb.install b/testing/gthumb/gthumb.install new file mode 100644 index 000000000..5d8005402 --- /dev/null +++ b/testing/gthumb/gthumb.install @@ -0,0 +1,19 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.1) < 0 )); then + gconfpkg --uninstall gthumb + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gtk-vnc/PKGBUILD b/testing/gtk-vnc/PKGBUILD new file mode 100644 index 000000000..c61a17dd1 --- /dev/null +++ b/testing/gtk-vnc/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 155176 2012-04-01 11:34:48Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot +# Contributor: Allan McRae +# Contributor: lp76 + +pkgname=gtk-vnc +pkgver=0.5.0 +pkgrel=1 +pkgdesc="A VNC viewer widget for GTK" +arch=('i686' 'x86_64') +url="http://live.gnome.org/gtk-vnc" +license=('LGPL') +depends=('libgcrypt' 'gtk3') +optdepends=('gtk2: GTK2 widget') +makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('1de65d8ffa8c25a61a8e8c4b7e5963d4a826f4fcf7120d66ed027f5f70cc8f81') + +build() { + rm -rf gtk2-build gtk3-build + cp -a $pkgname-$pkgver gtk2-build + mv $pkgname-$pkgver gtk3-build + + ( cd gtk2-build + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --with-python --disable-static --with-gtk=2.0 + make ) + + ( cd gtk3-build + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --with-python --with-examples --disable-static --with-gtk=3.0 + make ) +} + +package() { + make -C gtk2-build -j1 DESTDIR="${pkgdir}" install + make -C gtk3-build -j1 DESTDIR="${pkgdir}" install +} diff --git a/testing/gtk3/PKGBUILD b/testing/gtk3/PKGBUILD new file mode 100644 index 000000000..1813322b4 --- /dev/null +++ b/testing/gtk3/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 155168 2012-04-01 11:34:35Z heftig $ +# Maintainer: Ionut Biru + +pkgname=gtk3 +pkgver=3.4.0 +pkgrel=1 +pkgdesc="GObject-based multi-platform GUI toolkit (v3)" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +install=gtk3.install +depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord') +makedepends=('gobject-introspection') +options=('!libtool') +backup=(etc/gtk-3.0/settings.ini) +license=('LGPL') +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz + settings.ini) +sha256sums=('00af8be8bc60355e08a8f57e3e7503c916cec5cd5c6acb3eaedb01330b81f3e0' + 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') +build() { + cd "gtk+-$pkgver" + export CFLAGS+=" -g -O0" + CXX=/bin/false ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-gtk2-dependency \ + --disable-schemas-compile + #https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +package() { + cd "gtk+-$pkgver" + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini" +} diff --git a/testing/gtk3/gtk3.install b/testing/gtk3/gtk3.install new file mode 100644 index 000000000..ca20d2865 --- /dev/null +++ b/testing/gtk3/gtk3.install @@ -0,0 +1,16 @@ +post_install() { + /usr/bin/gtk-query-immodules-3.0 --update-cache + /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache +} + +post_remove() { + /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas +} diff --git a/testing/gtk3/settings.ini b/testing/gtk3/settings.ini new file mode 100644 index 000000000..039000d38 --- /dev/null +++ b/testing/gtk3/settings.ini @@ -0,0 +1,2 @@ +[Settings] +gtk-fallback-icon-theme = gnome diff --git a/testing/gtkhtml4/PKGBUILD b/testing/gtkhtml4/PKGBUILD new file mode 100644 index 000000000..63b73ff63 --- /dev/null +++ b/testing/gtkhtml4/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 155170 2012-04-01 11:34:37Z heftig $ +# Maintainer: Ionut Biru + +pkgname=gtkhtml4 +_pkgbasename=gtkhtml +pkgver=4.4.0 +pkgrel=1 +pkgdesc="A lightweight HTML renderer/editor widget for GTK3" +arch=(i686 x86_64) +license=('GPL') +depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup') +makedepends=('intltool') +url="http://www.gnome.org" +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) +sha256sums=('9c07260cd5d20c6dfba42fe1e784fffc98af3a82ff5b7d05be3174d6b0bffe9d') + +build() { + cd "$_pkgbasename-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/gtkhtml4 \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "$_pkgbasename-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/gtkmm3/PKGBUILD b/testing/gtkmm3/PKGBUILD new file mode 100644 index 000000000..3d75bc777 --- /dev/null +++ b/testing/gtkmm3/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 155172 2012-04-01 11:34:41Z heftig $ +# Maintainer: Ionut Biru + +pkgbase=gtkmm3 +_pkgbasename=gtkmm +pkgname=('gtkmm3' 'gtkmm3-docs') +pkgver=3.3.20 +pkgrel=1 +arch=('i686' 'x86_64') +makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common') +license=('LGPL') +options=('!libtool' '!emptydirs') +url="http://www.gtkmm.org/" +source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) +sha256sums=('ae131bc37c158d136f61f8d01377c0ee348e3e832a22272ffa7efc530197b6b4') + +build() { + cd "$_pkgbasename-$pkgver" + ./configure --prefix=/usr + make +} + +package_gtkmm3() { + pkgdesc="C++ bindings for gtk3" + depends=('gtk3' 'pangomm' 'atkmm') + cd "$_pkgbasename-$pkgver" + + sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile + + make DESTDIR="$pkgdir" install +} + +package_gtkmm3-docs() { + pkgdesc="Developer documentation for gtkmm v3" + + cd "$_pkgbasename-$pkgver" + make -C docs DESTDIR="$pkgdir" install +} diff --git a/testing/gtksourceview3/PKGBUILD b/testing/gtksourceview3/PKGBUILD new file mode 100644 index 000000000..19f1b2c1e --- /dev/null +++ b/testing/gtksourceview3/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 155174 2012-04-01 11:34:44Z heftig $ +# Maintainer: Ionut Biru + +pkgname=gtksourceview3 +_pkgbasename=gtksourceview +pkgver=3.4.0 +pkgrel=1 +pkgdesc="A text widget adding syntax highlighting and more to GNOME" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk3' 'libxml2') +makedepends=('intltool' 'gobject-introspection' 'glade') +options=('!libtool') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) +sha256sums=('a380b0aaace095568a5b485dd479b61f61f77941d0c02a00246ad4dfe956b655') + +build() { + cd "$_pkgbasename-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-glade-catalog + make +} + +package() { + cd "$_pkgbasename-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/gucharmap/PKGBUILD b/testing/gucharmap/PKGBUILD new file mode 100644 index 000000000..c464cd210 --- /dev/null +++ b/testing/gucharmap/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 155178 2012-04-01 11:34:52Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan De Groot + +pkgname=gucharmap +pkgver=3.4.0.1 +pkgrel=1 +pkgdesc="Gnome Unicode Charmap" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org" +depends=('dconf' 'gtk3' 'hicolor-icon-theme') +makedepends=('gtk-doc' 'intltool' 'gobject-introspection') +options=('!libtool' '!emptydirs') +install=gucharmap.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('eac2f2281cde5118544bc930b9ce90e68302a8c4ea09755f0db3e2e5e022b23c') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile --enable-introspection + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/gucharmap/gucharmap.install b/testing/gucharmap/gucharmap.install new file mode 100644 index 000000000..9a19b56fc --- /dev/null +++ b/testing/gucharmap/gucharmap.install @@ -0,0 +1,17 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + (( $(vercmp $2 3.3) < 0 )) && gconfpkg --uninstall gucharmap + return 0 +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/gvfs/PKGBUILD b/testing/gvfs/PKGBUILD new file mode 100644 index 000000000..8f3ca6dba --- /dev/null +++ b/testing/gvfs/PKGBUILD @@ -0,0 +1,112 @@ +# $Id: PKGBUILD 155180 2012-04-01 11:34:55Z heftig $ +# Maintainer: Jan de Groot + +pkgbase=gvfs +pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') +pkgver=1.12.0 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2') +url="http://www.gnome.org" +options=(!libtool) +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +sha256sums=('87ffb27fd884be65570d64530c3121f9e49848070b62a26e39cd363f6a6bd555') + +build() { + cd "$pkgbase-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gvfs \ + --with-bash-completion-dir=/etc/bash_completion.d + make +} + +package_gvfs() { + pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" + depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2') + optdepends=('gvfs-afc: AFC (mobile devices) support' + 'gvfs-smb: SMB/CIFS (Windows client) support' + 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' + 'gvfs-obexftp: ObexFTP (bluetooth) support' + 'gvfs-afp: Apple Filing Protocol (AFP) support') + install=gvfs.install + + cd "$pkgbase-$pkgver" + sed -e 's/^am__append_4/#am__append_4/' \ + -e 's/^am__append_5/#am__append_5/' \ + -i monitor/Makefile + make DESTDIR="$pkgdir" install + + cd "$pkgdir" + rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp} + rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount + rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml + rm usr/share/GConf/gsettings/gvfs-smb.convert +} + +package_gvfs-smb() { + pkgdesc="SMB/CIFS (Windows client) backend for gvfs" + depends=("gvfs=$pkgver" 'smbclient' 'libgnome-keyring') + install=gvfs-smb.install + + cd "$pkgbase-$pkgver/daemon" + install -m755 -d "$pkgdir/usr/lib/gvfs" + install -m755 -d "$pkgdir/usr/share/gvfs/mounts" + + install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/" + install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/" + + install -Dm644 org.gnome.system.smb.gschema.xml \ + "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml" + install -Dm644 gvfs-smb.convert \ + "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert" +} + +package_gvfs-afc() { + pkgdesc="AFC (mobile devices) backend for gvfs" + depends=("gvfs=$pkgver" 'libimobiledevice') + install=gvfs-module.install + + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc" + install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount" + + cd "$srcdir/$pkgbase-$pkgver/monitor/afc" + make DESTDIR="$pkgdir" install +} + +package_gvfs-gphoto2() { + pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs" + depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev') + install=gvfs-module.install + + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2" + install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount" + + cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2" + make DESTDIR="$pkgdir" install +} + +package_gvfs-obexftp() { + pkgdesc="ObexFTP (bluetooth) backend for gvfs" + depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server') + install=gvfs-module.install + + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp" + install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount" +} + +package_gvfs-afp() { + pkgdesc="Apple Filing Protocol (AFP) backend for gvfs" + depends=("gvfs=$pkgver") + install=gvfs-module.install + install -m755 -d "$pkgdir/usr/lib/gvfs" + install -m755 -d "$pkgdir/usr/share/gvfs/mounts" + + cd "$pkgbase-$pkgver/daemon" + install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/" + install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/" +} diff --git a/testing/gvfs/gvfs-module.install b/testing/gvfs/gvfs-module.install new file mode 100644 index 000000000..09d1f11ec --- /dev/null +++ b/testing/gvfs/gvfs-module.install @@ -0,0 +1,7 @@ +post_install() { + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} diff --git a/testing/gvfs/gvfs-smb.install b/testing/gvfs/gvfs-smb.install new file mode 100644 index 000000000..da6a2ab6d --- /dev/null +++ b/testing/gvfs/gvfs-smb.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} + +post_remove() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} diff --git a/testing/gvfs/gvfs.install b/testing/gvfs/gvfs.install new file mode 100644 index 000000000..3482d99e3 --- /dev/null +++ b/testing/gvfs/gvfs.install @@ -0,0 +1,14 @@ +post_install() { + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas + killall -USR1 gvfsd >&/dev/null || : +} + +post_upgrade() { + post_install +} + +post_remove() { + gio-querymodules /usr/lib/gio/modules + glib-compile-schemas /usr/share/glib-2.0/schemas +} diff --git a/testing/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch b/testing/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch new file mode 100644 index 000000000..bf2c3501f --- /dev/null +++ b/testing/kmod/0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch @@ -0,0 +1,50 @@ +From 666ba68a0635048aea0db70cd9ec61aea9b61ed2 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen +Date: Sat, 3 Mar 2012 12:37:06 +0100 +Subject: [PATCH 1/2] split usr: read configs from /lib/{depmod.d,modprobe.d} + +This allows rootprefix to be set to /usr, even if not all other packages +have been fixed to read from this dir. +--- + libkmod/libkmod.c | 5 +++-- + tools/kmod-depmod.c | 1 + + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c +index 36ca629..12c1112 100644 +--- a/libkmod/libkmod.c ++++ b/libkmod/libkmod.c +@@ -62,6 +62,7 @@ static const char *default_config_paths[] = { + SYSCONFDIR "/modprobe.d", + "/run/modprobe.d", + ROOTPREFIX "/lib/modprobe.d", ++ "/lib/modprobe.d", + NULL + }; + +@@ -223,8 +224,8 @@ static char *get_kernel_release(const char *dirname) + * @config_paths: ordered array of paths (directories or files) where + * to load from user-defined configuration parameters such as + * alias, blacklists, commands (install, remove). If +- * NULL defaults to /run/modprobe.d, /etc/modprobe.d and +- * $rootprefix/lib/modprobe.d. Give an empty vector if ++ * NULL defaults to /run/modprobe.d, /etc/modprobe.d, ++ * $rootprefix/lib/modprobe.d and /lib/modprobe.d. Give an empty vector if + * configuration should not be read. This array must be null + * terminated. + * +diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c +index 1871e18..7bb1c5d 100644 +--- a/tools/kmod-depmod.c ++++ b/tools/kmod-depmod.c +@@ -58,6 +58,7 @@ static const char *default_cfg_paths[] = { + "/run/depmod.d", + SYSCONFDIR "/depmod.d", + ROOTPREFIX "/lib/depmod.d", ++ "/lib/depmod.d", + NULL + }; + +-- +1.7.9.5 + diff --git a/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch b/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch new file mode 100644 index 000000000..f39f36ace --- /dev/null +++ b/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch @@ -0,0 +1,93 @@ +From 53e7e0e42428770578ca0d54d0a9540f498f917f Mon Sep 17 00:00:00 2001 +From: Tom Gundersen +Date: Sat, 31 Mar 2012 12:17:39 +0200 +Subject: [PATCH 2/2] config: hardcode the path to modules to be /lib/modules + +This means that we can move the configuration paths from /lib +to /usr/lib without having to touch the kernel and related +packages. + +That can be dealt with separately at a later location, in which case +all we have to do is revert this patch. + +Signed-off-by: Tom Gundersen +--- + libkmod/libkmod.c | 2 +- + tools/kmod-depmod.c | 2 +- + tools/kmod-modinfo.c | 4 ++-- + tools/kmod-modprobe.c | 4 ++-- + 4 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c +index 12c1112..11edfa0 100644 +--- a/libkmod/libkmod.c ++++ b/libkmod/libkmod.c +@@ -196,7 +196,7 @@ static int log_priority(const char *priority) + return 0; + } + +-static const char *dirname_default_prefix = ROOTPREFIX "/lib/modules"; ++static const char *dirname_default_prefix = "/lib/modules"; + + static char *get_kernel_release(const char *dirname) + { +diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c +index 7bb1c5d..454d538 100644 +--- a/tools/kmod-depmod.c ++++ b/tools/kmod-depmod.c +@@ -2634,7 +2634,7 @@ static int do_depmod(int argc, char *argv[]) + } + + cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX, +- "%s" ROOTPREFIX "/lib/modules/%s", ++ "%s/lib/modules/%s", + root == NULL ? "" : root, cfg.kversion); + + if (optind == argc) +diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c +index aa5223f..b13cd4b 100644 +--- a/tools/kmod-modinfo.c ++++ b/tools/kmod-modinfo.c +@@ -339,7 +339,7 @@ static void help(const char *progname) + "\t-0, --null Use \\0 instead of \\n\n" + "\t-F, --field=FIELD Print only provided FIELD\n" + "\t-k, --set-version=VERSION Use VERSION instead of `uname -r`\n" +- "\t-b, --basedir=DIR Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n" ++ "\t-b, --basedir=DIR Use DIR as filesystem root for /lib/modules\n" + "\t-V, --version Show version\n" + "\t-h, --help Show this help\n", + progname); +@@ -439,7 +439,7 @@ static int do_modinfo(int argc, char *argv[]) + } + kversion = u.release; + } +- snprintf(dirname_buf, sizeof(dirname_buf), "%s" ROOTPREFIX "/lib/modules/%s", ++ snprintf(dirname_buf, sizeof(dirname_buf), "%s/lib/modules/%s", + root, kversion); + dirname = dirname_buf; + } +diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c +index 4760682..ccb41d8 100644 +--- a/tools/kmod-modprobe.c ++++ b/tools/kmod-modprobe.c +@@ -128,7 +128,7 @@ static void help(const char *progname) + "\t-n, --show Same as --dry-run\n" + + "\t-C, --config=FILE Use FILE instead of default search paths\n" +- "\t-d, --dirname=DIR Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n" ++ "\t-d, --dirname=DIR Use DIR as filesystem root for /lib/modules\n" + "\t-S, --set-version=VERSION Use VERSION instead of `uname -r`\n" + + "\t-s, --syslog print to syslog, not stderr\n" +@@ -973,7 +973,7 @@ static int do_modprobe(int argc, char **orig_argv) + kversion = u.release; + } + snprintf(dirname_buf, sizeof(dirname_buf), +- "%s" ROOTPREFIX "/lib/modules/%s", root, ++ "%s/lib/modules/%s", root, + kversion); + dirname = dirname_buf; + } +-- +1.7.9.5 + diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD index 4752bd55e..a027ee19f 100644 --- a/testing/kmod/PKGBUILD +++ b/testing/kmod/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153751 2012-03-19 12:36:26Z dreisner $ +# $Id: PKGBUILD 155335 2012-04-01 20:12:30Z tomegun $ # Maintainer: Dave Reisner pkgname=kmod pkgver=7 -pkgrel=1 +pkgrel=2 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64') url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary' @@ -14,16 +14,24 @@ provides=('module-init-tools=3.16') conflicts=('module-init-tools') replaces=('module-init-tools') source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz" - "depmod-search.conf") + "depmod-search.conf" + "0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch" + "0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch") md5sums=('7bd916ae1c8a38e7697fdd8118bc98eb' - '09d8af2ba37c5902d904275cb27f1b09') + 'dd62cbf62bd8f212f51ef8c43bec9a77' + 'ba73b9e98db1abbf41274f922fcfbd55' + 'c9af56636c5667cf4ce3a31ea56e03d9') build() { cd "$pkgname-$pkgver" + patch -p1 -i ../0001-split-usr-read-configs-from-lib-depmod.d-modprobe.d.patch + patch -p1 -i ../0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch + ./configure \ --sysconfdir=/etc \ - --with-zlib + --with-zlib \ + --with-rootprefix=/usr make } @@ -36,7 +44,7 @@ package() { make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install # extra directories - install -dm755 "$pkgdir"/{etc,lib}/{depmod,modprobe}.d "$pkgdir/sbin" + install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d "$pkgdir/sbin" # add symlinks to kmod ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe" @@ -47,7 +55,7 @@ package() { done # install depmod.d file for search/ dir - install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/lib/depmod.d/search.conf" + install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/usr/lib/depmod.d/search.conf" } # vim: ft=sh syn=sh et diff --git a/testing/kmod/depmod-search.conf b/testing/kmod/depmod-search.conf index 240606a88..36f2cf7db 100644 --- a/testing/kmod/depmod-search.conf +++ b/testing/kmod/depmod-search.conf @@ -1,5 +1,5 @@ # -# /lib/depmod.d/search.conf +# /usr/lib/depmod.d/search.conf # search updates extramodules built-in diff --git a/testing/libchamplain/PKGBUILD b/testing/libchamplain/PKGBUILD new file mode 100644 index 000000000..bf1f1d11d --- /dev/null +++ b/testing/libchamplain/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 155182 2012-04-01 11:35:00Z heftig $ +# Maintainer: Andreas Radke +# Contributor: Michael Kanis + +pkgname=libchamplain +pkgver=0.12.2 +pkgrel=1 +pkgdesc="Gtk3 widget for displaying rasterized maps" +url="http://projects.gnome.org/libchamplain/" +license=('LGPL') +arch=('i686' 'x86_64') +options=('!libtool') +depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite3') +makedepends=('gobject-introspection' 'gtk-doc' 'vala') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('d23f97875e407fdc3e8fc86bef538a377c42f37f5be4fc8ec6063e7446fd7e2e') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static --disable-debug --enable-vala + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/libcroco/PKGBUILD b/testing/libcroco/PKGBUILD new file mode 100644 index 000000000..253f9eac5 --- /dev/null +++ b/testing/libcroco/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 155184 2012-04-01 11:35:02Z heftig $ +# Maintainer: Jan de Groot + +pkgname=libcroco +pkgver=0.6.5 +pkgrel=1 +pkgdesc="A CSS parsing library" +arch=('x86_64' 'i686') +depends=('glib2' 'libxml2') +makedepends=('intltool') +license=('LGPL') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz) +url="http://www.gnome.org" +sha256sums=('2c6959c3644e889264a61c35ddf17401c86943681d4fe3c1682ecd9acabda7e3') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/libgda/PKGBUILD b/testing/libgda/PKGBUILD new file mode 100644 index 000000000..e2cfe4287 --- /dev/null +++ b/testing/libgda/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 155186 2012-04-01 11:35:06Z heftig $ +# Maintainer: tobias +# Contributor: Tobias Kieslich + +pkgname=libgda +pkgver=5.0.3 +pkgrel=1 +pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" +arch=(i686 x86_64) +license=('GPL') +depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup' + 'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring' + 'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2' + 'iso-codes' 'openssl' 'libgcrypt' 'libldap') +makedepends=('intltool' 'gobject-introspection' 'openjdk6' 'gtk-doc' 'vala') +options=('!libtool') +url="http://www.gnome-db.org" +install=libgda.install +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('82d204361b794103c366bb690484d25814bfc653cb97da0dfcf7c0a13409d1cc') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed -i '1s/python$/&2/' libgda-report/RML/trml*/trml*.py + ./configure --prefix=/usr --sysconfdir=/etc \ + --with-bdb=/usr --with-bdb-libdir-name=lib \ + --disable-static --enable-json + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/libgda/libgda.install b/testing/libgda/libgda.install new file mode 100644 index 000000000..c317fbaca --- /dev/null +++ b/testing/libgda/libgda.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/libgdata/PKGBUILD b/testing/libgdata/PKGBUILD new file mode 100644 index 000000000..a36a72fef --- /dev/null +++ b/testing/libgdata/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 155188 2012-04-01 11:35:10Z heftig $ +# Maintainer: Jan de Groot + +pkgname=libgdata +pkgver=0.11.0 +pkgrel=1 +pkgdesc="GLib-based library for accessing online service APIs using the GData protocol" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libsoup-gnome' 'liboauth') +makedepends=('intltool' 'gobject-introspection') +url="http://www.gnome.org" +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('819a077fab77cca9408409bf86da5b028699972c2c9bbf96e41755f801acea6b') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/libgnome-keyring/PKGBUILD b/testing/libgnome-keyring/PKGBUILD new file mode 100644 index 000000000..c62b3e9a7 --- /dev/null +++ b/testing/libgnome-keyring/PKGBUILD @@ -0,0 +1,28 @@ +#$Id: PKGBUILD 155192 2012-04-01 11:35:16Z heftig $ +#Maintainer: Jan De Groot + +pkgname=libgnome-keyring +pkgver=3.4.0 +pkgrel=1 +pkgdesc="GNOME keyring client library" +arch=(i686 x86_64) +license=('GPL' 'LGPL') +depends=('dbus-core' 'glib2' 'libgcrypt') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('60cc0728fd9c1c10c62b05abec24037ca616931e167b658ed78ec93ede2d3f7a') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/gnome-keyring + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/libgnomekbd/PKGBUILD b/testing/libgnomekbd/PKGBUILD new file mode 100644 index 000000000..dd0b274e2 --- /dev/null +++ b/testing/libgnomekbd/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 155190 2012-04-01 11:35:12Z heftig $ +# Maintainer: Jan de Groot + +pkgname=libgnomekbd +pkgver=3.4.0.2 +pkgrel=1 +pkgdesc="Gnome keyboard library" +url="http://gswitchit.sourceforge.net" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('libxklavier' 'gtk3' 'dconf') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool' '!emptydirs') +install=libgnomekbd.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('6e6c8956adbd39f1c3a8ec5c77bcf7ffbdaa54320398015d1174cd5003664e39') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/libgnomekbd/libgnomekbd.install b/testing/libgnomekbd/libgnomekbd.install new file mode 100644 index 000000000..a3d820459 --- /dev/null +++ b/testing/libgnomekbd/libgnomekbd.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/libgpod/PKGBUILD b/testing/libgpod/PKGBUILD new file mode 100644 index 000000000..85a83d43d --- /dev/null +++ b/testing/libgpod/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 155325 2012-04-01 19:53:04Z tomegun $ +# Maintainer: Daniel Isenmann +# Contributor: William Rea + +pkgname=libgpod +pkgver=0.8.2 +pkgrel=4 +pkgdesc="A shared library to access the contents of an iPod" +arch=(i686 x86_64) +license=('LGPL') +depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice') +makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2') +optdepends=('gtk-sharp-2: Mono bindings') +url="http://www.gtkpod.org/libgpod/" +source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2) +options=('!libtool' '!emptydirs') +md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --with-udev-dir=/usr/lib/udev \ + --enable-udev --with-python=/usr/bin/python2 + make PREFIX=/usr +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX=/usr DESTDIR="${pkgdir}" install +} + diff --git a/testing/libgweather/PKGBUILD b/testing/libgweather/PKGBUILD new file mode 100644 index 000000000..412b39321 --- /dev/null +++ b/testing/libgweather/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 155194 2012-04-01 11:35:19Z heftig $ +# Maintainer: Jan de Groot + +pkgname=libgweather +pkgver=3.4.1 +pkgrel=1 +pkgdesc="Provides access to weather information from the net" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('gconf' 'libsoup-gnome' 'gnome-icon-theme') +makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org/" +install=libgweather.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + gettext-not-xml.patch) +sha256sums=('ee9c4d09f33ae2b066dd1e696aa3e483a689cba6d63bcd388cc2ef95df9b1b60' + '3808da5c27bad1152eee824db2cead21de599af198eca017a18e1b0adb366330') + +build() { + cd "$pkgname-$pkgver" + + patch -Np1 -i "$srcdir/gettext-not-xml.patch" + gtkdocize + autoreconf -fi + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-locations-compression + 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 libgweather "$pkgdir"/etc/gconf/schemas/*.schemas + rm -f "$pkgdir"/etc/gconf/schemas/*.schemas +} diff --git a/testing/libgweather/gettext-not-xml.patch b/testing/libgweather/gettext-not-xml.patch new file mode 100644 index 000000000..46ea98f48 --- /dev/null +++ b/testing/libgweather/gettext-not-xml.patch @@ -0,0 +1,532 @@ +diff -Nur libgweather-3.4.0.orig/configure.ac libgweather-3.4.0/configure.ac +--- libgweather-3.4.0.orig/configure.ac 2012-03-08 20:49:21.497783149 +0000 ++++ libgweather-3.4.0/configure.ac 2012-03-08 20:59:21.082941563 +0000 +@@ -43,19 +43,16 @@ + LT_PREREQ([2.2.6]) + LT_INIT([dlopen win32-dll disable-static]) + ++dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations ++AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile]) ++IT_PO_SUBDIR([po-locations]) ++ + IT_PROG_INTLTOOL([0.40.6]) + PKG_PROG_PKG_CONFIG([0.19]) + + AC_PROG_CC + AC_PATH_PROG(GCONFTOOL, gconftool-2) + +-AC_ARG_ENABLE(all-translations-in-one-xml, +- [AS_HELP_STRING([--enable-all-translations-in-one-xml], +- [Put all translations in a big Locations.xml file (slow to parse)])], +- [enable_big_xml=yes], +- [enable_big_xml=no]) +-AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes") +- + AC_ARG_ENABLE(locations-compression, + [AS_HELP_STRING([--enable-locations-compression], + [Compress Locations.xml files])], +@@ -178,7 +175,7 @@ + Makefile + doc/Makefile + po/Makefile.in +-po-locations/Makefile ++po-locations/Makefile.in + libgweather/Makefile + libgweather/gweather-3.0.pc + libgweather/gweather-3.0-uninstalled.pc +@@ -187,12 +184,6 @@ + ]) + AC_OUTPUT + +-if test "x$enable_big_xml" = "xyes"; then +- LOCATIONS_XML_TRANSLATIONS="one big file" +-else +- LOCATIONS_XML_TRANSLATIONS="one file per translation" +-fi +- + dnl *************************************************************************** + dnl *** Display Summary *** + dnl *************************************************************************** +@@ -203,6 +194,4 @@ + Source code location: ${srcdir} + Compiler: ${CC} + Introspection support: ${found_introspection} +- Locations.xml translations: ${LOCATIONS_XML_TRANSLATIONS} +- Locations.xml compression: ${enable_locations_compression} + " >&2 +diff -Nur libgweather-3.4.0.orig/data/Makefile.am libgweather-3.4.0/data/Makefile.am +--- libgweather-3.4.0.orig/data/Makefile.am 2012-03-08 20:49:21.484449916 +0000 ++++ libgweather-3.4.0/data/Makefile.am 2012-03-08 21:00:28.359065326 +0000 +@@ -4,55 +4,23 @@ + libgweatherlocationsdir = $(pkgdatadir) + libgweatherlocations_in_files = Locations.xml.in + +-if USE_ONE_BIG_XML +- +-LOCATIONS_STAMP = +- +-libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT)) +- +-%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po) +- $(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \ +- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ +- gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`; \ +- fi +- +-else # USE_ONE_BIG_XML +- + LOCATIONS_STAMP = stamp-Locations.xml + +-PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi) +- + # Helper variable +-libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml) +- +-libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT) ++libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml) + + # We need this step so that we merge all the make Locations.xy.xml destinations + # into one unique destination. This makes -j2 work. (Else, we end up with + # multiple and conflicting calls to intltool-merge) + $(libgweatherlocations_DATA): $(LOCATIONS_STAMP) + +-$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile +- $(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \ +- for pofile in $(PO_LOCATIONS); do \ +- locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`; \ +- xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \ +- rm -f $$locale/$(libgweatherlocations_data); \ +- test -d $$locale && rmdir $$locale; \ +- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ +- gzip --force Locations.$$locale.xml; \ +- fi; \ +- done && \ +- xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \ +- rm -f C/$(libgweatherlocations_data) && \ +- test -d C && rmdir C && \ +- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ +- gzip --force Locations.xml; \ +- fi && \ ++$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile ++ LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA) ++ xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA) ++ rm -f C/$(libgweatherlocations_DATA) ++ test -d C && rmdir C + touch $@ + +-endif # USE_ONE_BIG_XML +- + ### Locations.xml.in rebuild + rebuild-locations: locationdb.sqlite update-locations.py + $(AM_V_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new +diff -Nur libgweather-3.4.0.orig/libgweather/gweather-location.c libgweather-3.4.0/libgweather/gweather-location.c +--- libgweather-3.4.0.orig/libgweather/gweather-location.c 2012-03-08 20:49:21.487783240 +0000 ++++ libgweather-3.4.0/libgweather/gweather-location.c 2012-03-08 21:00:28.359065326 +0000 +@@ -22,11 +22,14 @@ + #include + #endif + ++#include "config.h" ++ + #include + #include + #include + #include + #include ++#include + + #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE + #include "gweather-location.h" +@@ -185,10 +188,20 @@ + + tagname = (const char *) xmlTextReaderConstName (parser->xml); + if (!strcmp (tagname, "name") && !loc->name) { +- value = gweather_parser_get_localized_value (parser); ++ char *context = NULL; ++ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); ++ ++ value = gweather_parser_get_value (parser); + if (!value) + goto error_out; +- loc->name = g_strdup (value); ++ ++ if (context != NULL) { ++ loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value)); ++ xmlFree (context); ++ } ++ else ++ loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value)); ++ + xmlFree (value); + normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL); + loc->sort_name = g_utf8_casefold (normalized, -1); +diff -Nur libgweather-3.4.0.orig/libgweather/gweather-timezone.c libgweather-3.4.0/libgweather/gweather-timezone.c +--- libgweather-3.4.0.orig/libgweather/gweather-timezone.c 2012-03-08 20:49:21.487783240 +0000 ++++ libgweather-3.4.0/libgweather/gweather-timezone.c 2012-03-08 21:00:28.359065326 +0000 +@@ -23,6 +23,7 @@ + #endif + + #include ++#include + + #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE + #include "gweather-timezone.h" +@@ -154,7 +155,7 @@ + parse_timezone (GWeatherParser *parser) + { + GWeatherTimezone *zone = NULL; +- char *id = NULL, *name = NULL; ++ char *id = NULL, *name = NULL, *context = NULL; + int offset = 0, dst_offset = 0; + gboolean has_dst = FALSE; + +@@ -177,27 +178,34 @@ + continue; + } + +- if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) +- name = gweather_parser_get_localized_value (parser); ++ if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) { ++ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); ++ name = gweather_parser_get_value (parser); ++ } + else { + if (xmlTextReaderNext (parser->xml) != 1) + break; + } + } + } +- ++ + if (parse_tzdata (id, parser->year_start, parser->year_end, + &offset, &has_dst, &dst_offset)) { + zone = g_slice_new0 (GWeatherTimezone); + zone->ref_count = 1; + zone->id = g_strdup (id); +- zone->name = g_strdup (name); ++ if (context != NULL) ++ zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name)); ++ else ++ zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name)); + zone->offset = offset; + zone->has_dst = has_dst; + zone->dst_offset = dst_offset; + } + + xmlFree (id); ++ if (context) ++ xmlFree (context); + if (name) + xmlFree (name); + +diff -Nur libgweather-3.4.0.orig/po-locations/LINGUAS libgweather-3.4.0/po-locations/LINGUAS +--- libgweather-3.4.0.orig/po-locations/LINGUAS 1970-01-01 00:00:00.000000000 +0000 ++++ libgweather-3.4.0/po-locations/LINGUAS 2012-03-08 21:00:28.359065326 +0000 +@@ -0,0 +1,78 @@ ++ang ++ar ++as ++az ++be ++be@latin ++bg ++bn_IN ++bn ++bs ++ca ++cs ++cy ++da ++de ++dz ++el ++en_CA ++en_GB ++es ++et ++eu ++fa ++fi ++fr ++ga ++gl ++gu ++he ++hi ++hr ++hu ++id ++it ++ja ++ka ++kn ++ko ++ku ++ky ++lt ++lv ++mai ++mg ++mk ++ml ++mn ++mr ++ms ++nb ++ne ++nl ++nn ++oc ++or ++pa ++pl ++pt_BR ++pt ++ro ++ru ++rw ++si ++sk ++sl ++sq ++sr@latin ++sr ++sv ++ta ++te ++th ++tr ++uk ++vi ++zh_CN ++zh_HK ++zh_TW +diff -Nur libgweather-3.4.0.orig/po-locations/Makefile.in.in libgweather-3.4.0/po-locations/Makefile.in.in +--- libgweather-3.4.0.orig/po-locations/Makefile.in.in 1970-01-01 00:00:00.000000000 +0000 ++++ libgweather-3.4.0/po-locations/Makefile.in.in 2012-03-08 21:00:28.359065326 +0000 +@@ -0,0 +1,217 @@ ++# Makefile for program source directory in GNU NLS utilities package. ++# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper ++# Copyright (C) 2004-2008 Rodney Dawes ++# ++# This file may be copied and used freely without restrictions. It may ++# be used in projects which are not available under a GNU Public License, ++# but which still want to provide support for the GNU gettext functionality. ++# ++# - Modified by Owen Taylor to use GETTEXT_PACKAGE ++# instead of PACKAGE and to look for po2tbl in ./ not in intl/ ++# ++# - Modified by jacob berkman to install ++# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize ++# ++# - Modified by Rodney Dawes for use with intltool ++# ++# We have the following line for use by intltoolize: ++# INTLTOOL_MAKEFILE ++ ++GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations ++PACKAGE = @PACKAGE@ ++VERSION = @VERSION@ ++ ++SHELL = /bin/sh ++ ++srcdir = @srcdir@ ++top_srcdir = @top_srcdir@ ++top_builddir = @top_builddir@ ++VPATH = @srcdir@ ++ ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ ++datadir = @datadir@ ++datarootdir = @datarootdir@ ++libdir = @libdir@ ++DATADIRNAME = @DATADIRNAME@ ++itlocaledir = $(prefix)/$(DATADIRNAME)/locale ++subdir = po-locations ++install_sh = @install_sh@ ++# Automake >= 1.8 provides @mkdir_p@. ++# Until it can be supposed, use the safe fallback: ++mkdir_p = $(install_sh) -d ++ ++INSTALL = @INSTALL@ ++INSTALL_DATA = @INSTALL_DATA@ ++ ++GMSGFMT = @GMSGFMT@ ++MSGFMT = @MSGFMT@ ++XGETTEXT = @XGETTEXT@ ++INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ ++INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ ++MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist ++GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot ++ ++ALL_LINGUAS = @ALL_LINGUAS@ ++ ++PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) ++ ++USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) ++ ++USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) ++ ++POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) ++ ++DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) ++EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS ++ ++POTFILES = \ ++# This comment gets stripped out ++ ++CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) ++ ++.SUFFIXES: ++.SUFFIXES: .po .pox .gmo .mo .msg .cat ++ ++.po.pox: ++ $(MAKE) $(GETTEXT_PACKAGE).pot ++ $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox ++ ++.po.mo: ++ $(MSGFMT) -o $@ $< ++ ++.po.gmo: ++ file=`echo $* | sed 's,.*/,,'`.gmo \ ++ && rm -f $$file && $(GMSGFMT) -o $$file $< ++ ++.po.cat: ++ sed -f ../intl/po2msg.sed < $< > $*.msg \ ++ && rm -f $@ && gencat $@ $*.msg ++ ++ ++all: all-@USE_NLS@ ++ ++all-yes: $(CATALOGS) ++all-no: ++ ++$(GETTEXT_PACKAGE).pot: $(POTFILES) ++ $(GENPOT) ++ ++install: install-data ++install-data: install-data-@USE_NLS@ ++install-data-no: all ++install-data-yes: all ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ ++ $(mkdir_p) $$dir; \ ++ if test -r $$lang.gmo; then \ ++ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ ++ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ ++ else \ ++ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ ++ echo "installing $(srcdir)/$$lang.gmo as" \ ++ "$$dir/$(GETTEXT_PACKAGE).mo"; \ ++ fi; \ ++ if test -r $$lang.gmo.m; then \ ++ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ ++ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ ++ else \ ++ if test -r $(srcdir)/$$lang.gmo.m ; then \ ++ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ ++ $$dir/$(GETTEXT_PACKAGE).mo.m; \ ++ echo "installing $(srcdir)/$$lang.gmo.m as" \ ++ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ ++ else \ ++ true; \ ++ fi; \ ++ fi; \ ++ done ++ ++# Empty stubs to satisfy archaic automake needs ++dvi info tags TAGS ID: ++ ++# Define this as empty until I found a useful application. ++install-exec installcheck: ++ ++uninstall: ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ ++ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ ++ done ++ ++check: all $(GETTEXT_PACKAGE).pot ++ rm -f missing notexist ++ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m ++ if [ -r missing -o -r notexist ]; then \ ++ exit 1; \ ++ fi ++ ++mostlyclean: ++ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp ++ rm -f .intltool-merge-cache ++ ++clean: mostlyclean ++ ++distclean: clean ++ rm -f Makefile Makefile.in POTFILES stamp-it ++ rm -f *.mo *.msg *.cat *.cat.m *.gmo ++ ++maintainer-clean: distclean ++ @echo "This command is intended for maintainers to use;" ++ @echo "it deletes files that may require special tools to rebuild." ++ rm -f Makefile.in.in ++ ++distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) ++dist distdir: $(DISTFILES) ++ dists="$(DISTFILES)"; \ ++ extra_dists="$(EXTRA_DISTFILES)"; \ ++ for file in $$extra_dists; do \ ++ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ ++ done; \ ++ for file in $$dists; do \ ++ test -f $$file || file="$(srcdir)/$$file"; \ ++ ln $$file $(distdir) 2> /dev/null \ ++ || cp -p $$file $(distdir); \ ++ done ++ ++update-po: Makefile ++ $(MAKE) $(GETTEXT_PACKAGE).pot ++ tmpdir=`pwd`; \ ++ linguas="$(USE_LINGUAS)"; \ ++ for lang in $$linguas; do \ ++ echo "$$lang:"; \ ++ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ ++ if $$result; then \ ++ if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ else \ ++ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ ++ :; \ ++ else \ ++ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ exit 1; \ ++ fi; \ ++ fi; \ ++ else \ ++ echo "msgmerge for $$lang.gmo failed!"; \ ++ rm -f $$tmpdir/$$lang.new.po; \ ++ fi; \ ++ done ++ ++Makefile POTFILES: stamp-it ++ @if test ! -f $@; then \ ++ rm -f stamp-it; \ ++ $(MAKE) stamp-it; \ ++ fi ++ ++stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in ++ cd $(top_builddir) \ ++ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ ++ $(SHELL) ./config.status ++ ++# Tell versions [3.59,3.63) of GNU make not to export all variables. ++# Otherwise a system limit (for SysV at least) may be exceeded. ++.NOEXPORT: +diff -Nur libgweather-3.4.0.orig/po-locations/POTFILES.in libgweather-3.4.0/po-locations/POTFILES.in +--- libgweather-3.4.0.orig/po-locations/POTFILES.in 1970-01-01 00:00:00.000000000 +0000 ++++ libgweather-3.4.0/po-locations/POTFILES.in 2012-03-08 21:00:28.359065326 +0000 +@@ -0,0 +1,4 @@ ++# This list should contain *only* data/Locations.xml.in. ++# Everything else should be in POTFILES.skip. ++[encoding:UTF-8] ++data/Locations.xml.in diff --git a/testing/libgweather/libgweather.install b/testing/libgweather/libgweather.install new file mode 100644 index 000000000..0d646b872 --- /dev/null +++ b/testing/libgweather/libgweather.install @@ -0,0 +1,22 @@ +pkgname=libgweather + +post_install() { + gconfpkg --install $pkgname + gtk-update-icon-cache -q -t -f /usr/share/icons/gnome +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + gconfpkg --uninstall $pkgname +} + +post_remove() { + gtk-update-icon-cache -q -t -f /usr/share/icons/gnome +} diff --git a/testing/libgxps/PKGBUILD b/testing/libgxps/PKGBUILD new file mode 100644 index 000000000..570ecf202 --- /dev/null +++ b/testing/libgxps/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 155196 2012-04-01 11:35:21Z heftig $ +# Maintainer: Ionut Biru + +pkgname=libgxps +pkgver=0.2.2 +pkgrel=1 +pkgdesc="XPS Documents library" +arch=(i686 x86_64) +url="https://live.gnome.org/libgxps" +license=('GPL2') +depends=('cairo' 'libarchive' 'libjpeg-turbo' 'libtiff' 'lcms2') +options=(!libtool) +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('39d104739bf0db43905c315de1d8002460f1a098576f4418f69294013a5820be') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/libimobiledevice/PKGBUILD b/testing/libimobiledevice/PKGBUILD new file mode 100644 index 000000000..7448bed1f --- /dev/null +++ b/testing/libimobiledevice/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 155198 2012-04-01 11:35:23Z heftig $ +# Maintainer : Ionut Biru +# Contributor: Gabriel Martinez < reitaka at gmail dot com > + +pkgname=libimobiledevice +pkgver=1.1.1 +pkgrel=3 +pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux" +url="http://libimobiledevice.org/" +arch=('i686' 'x86_64') +license=('GPL2' 'LGPL2.1') +depends=('usbmuxd' 'libplist' 'gnutls' 'libgcrypt') +makedepends=('python2' 'swig') +options=('!libtool') +source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2 + swig-version-check.patch) +md5sums=('cdc13037e822d9ac2e109536701d153a' + '8bb215e36fe0e08a72332c108c7842cc') + +build() { + cd "$pkgname-$pkgver" + + # SWIG version check is wrong (still not fixed upstream) + patch -p1 -i ../swig-version-check.patch + + PYTHON=/usr/bin/python2 ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/libimobiledevice/swig-version-check.patch b/testing/libimobiledevice/swig-version-check.patch new file mode 100644 index 000000000..c56b095db --- /dev/null +++ b/testing/libimobiledevice/swig-version-check.patch @@ -0,0 +1,14 @@ +diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure +--- libimobiledevice-1.0.3.old/configure 2010-10-04 07:38:37.000000000 -0700 ++++ libimobiledevice-1.0.3/configure 2010-10-08 05:43:05.466686656 -0700 +@@ -3477,9 +3477,7 @@ + if test -z "$available_patch" ; then + available_patch=0 + fi +- if test $available_major -ne $required_major \ +- -o $available_minor -ne $required_minor \ +- -o $available_patch -lt $required_patch ; then ++ if test $available_major -lt $required_major ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required. You have $swig_version. You should look at http://www.swig.org" >&5 + $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required. You have $swig_version. You should look at http://www.swig.org" >&2;} + SWIG=false diff --git a/testing/libmtp/PKGBUILD b/testing/libmtp/PKGBUILD new file mode 100644 index 000000000..3ff54753a --- /dev/null +++ b/testing/libmtp/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 155327 2012-04-01 19:53:07Z tomegun $ +# Contributor: damir +# Contributor: Kevin Edmonds + +pkgname=libmtp +pkgver=1.1.2 +pkgrel=2 +pkgdesc="Library implementation of the Media Transfer Protocol" +arch=("i686" "x86_64") +url="http://libmtp.sourceforge.net" +license=('LGPL') +depends=('libusb') +options=('!libtool') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('6dc708757e3fd3ccce7445b4f2171263') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --with-udev=/usr/lib/udev + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch b/testing/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch new file mode 100644 index 000000000..e1c099aae --- /dev/null +++ b/testing/libmusicbrainz4/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch @@ -0,0 +1,28 @@ +From 64c68ad42a9089c92dfa4e74f55b6c1b65b8f11c Mon Sep 17 00:00:00 2001 +From: Christophe Fergeau +Date: Sun, 4 Mar 2012 14:32:49 +0100 +Subject: [PATCH] Make sure gcc 4.7 can find usleep declaration + +Without this, compilation fails with: + +libmusicbrainz-4.0.0/src/Query.cc: In member function 'void MusicBrainz4::CQuery::WaitRequest() const': +libmusicbrainz-4.0.0/src/Query.cc:295:19: error: 'usleep' was not declared in this scope +--- + src/Query.cc | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/src/Query.cc b/src/Query.cc +index 5f5934f..9332346 100644 +--- a/src/Query.cc ++++ b/src/Query.cc +@@ -33,6 +33,7 @@ + + #include + #include ++#include + + #include + +-- +1.7.7.6 + diff --git a/testing/libmusicbrainz4/PKGBUILD b/testing/libmusicbrainz4/PKGBUILD new file mode 100644 index 000000000..a7e9e88b8 --- /dev/null +++ b/testing/libmusicbrainz4/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 155200 2012-04-01 11:35:28Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Ionut Biru +# Contributor: Max Fehrm max.fehrm@gmail.com + +pkgname=libmusicbrainz4 +pkgver=4.0.0 +pkgrel=1 +pkgdesc="Library That Provides Access to the MusicBrainz Server " +url="http://musicbrainz.org/" +arch=('i686' 'x86_64') +license=('LGPL2.1') +depends=('neon') +makedepends=('cmake') +source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-$pkgver.tar.gz + 0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch) +md5sums=('21c33f5dd20b8bb945b800e2a964f27e' + 'df1dfa423d32a7a1d08b3fc0114bf087') + +build() { + cd libmusicbrainz-$pkgver + patch -Np1 -i ../0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch + cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr + make +} + +package() { + cd libmusicbrainz-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/libpeas/PKGBUILD b/testing/libpeas/PKGBUILD new file mode 100644 index 000000000..2f5b1ded9 --- /dev/null +++ b/testing/libpeas/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 155202 2012-04-01 11:35:31Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=libpeas +pkgver=1.4.0 +pkgrel=1 +pkgdesc="A GObject-based plugins engine" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL2') +depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection') +makedepends=('gtk-doc' 'intltool' 'vala' 'python2-gobject' 'gjs' 'seed' 'glade') +optdepends=('gjs: gobject-based plugin engine - gjs runtime loader' + 'seed: gobject-based plugin engine - seed runtime loader') +options=('!libtool') +install=libpeas.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) +sha256sums=('d508df249d5aefad0e5a720095e0103355ab13856dae6a10e6e5b8235d5eecf6') + +build() { + cd $pkgname-$pkgver + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --sysconfdir=/etc --localstatedir=/var --enable-vala + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/libpeas/libpeas.install b/testing/libpeas/libpeas.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/testing/libpeas/libpeas.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/libplist/PKGBUILD b/testing/libplist/PKGBUILD new file mode 100644 index 000000000..d48b560e5 --- /dev/null +++ b/testing/libplist/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 155204 2012-04-01 11:35:32Z heftig $ +# Maintainer : Ionut Biru +# Contributor: Gabriel Martinez < reitaka at gmail dot com > + +pkgname=libplist +pkgver=1.8 +pkgrel=2 +pkgdesc="A library to handle Apple Property List format whereas it's binary or XML" +url="http://libimobiledevice.org/" +arch=('i686' 'x86_64') +license=('GPL2' 'LGPL2.1') +depends=('glib2' 'libxml2' 'python2') +makedepends=('cmake' 'swig') +source=(http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2) +sha256sums=('a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec') + +build() { + mkdir build + cd build + cmake ../$pkgname-$pkgver \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install +} diff --git a/testing/librsvg/PKGBUILD b/testing/librsvg/PKGBUILD new file mode 100644 index 000000000..8da75bec7 --- /dev/null +++ b/testing/librsvg/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 155206 2012-04-01 11:35:36Z heftig $ +# Maintainer: Jan de Groot + +pkgname=librsvg +pkgver=2.36.0 +pkgrel=1 +pkgdesc="A SVG viewing library" +arch=(i686 x86_64) +license=('LGPL') +depends=('gdk-pixbuf2>=2.24.1-3' 'pango' 'libcroco') +makedepends=('intltool' 'gtk2' 'gtk3' 'gobject-introspection') +optdepends=('gtk3: for rsvg-view-3') +options=('!libtool' '!emptydirs') +url="http://librsvg.sourceforge.net/" +install=librsvg.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('e6475e08c73e92c8bc58824e215551bd64ac5e9a492ff8c520b89c01a7ea510a') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/librsvg/librsvg.install b/testing/librsvg/librsvg.install new file mode 100644 index 000000000..4d48b071f --- /dev/null +++ b/testing/librsvg/librsvg.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/gdk-pixbuf-query-loaders --update-cache +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/libsocialweb/PKGBUILD b/testing/libsocialweb/PKGBUILD new file mode 100644 index 000000000..e701497a4 --- /dev/null +++ b/testing/libsocialweb/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 155208 2012-04-01 11:35:40Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=libsocialweb +pkgver=0.25.20 +pkgrel=1 +pkgdesc="A personal social data server" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL2') +depends=('glib2' 'gconf' 'libsoup-gnome' 'rest' 'dbus-glib' 'libgnome-keyring' + 'json-glib' 'networkmanager') +makedepends=('intltool' 'gtk-doc' 'vala' 'gobject-introspection') +options=('!libtool') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) +sha256sums=('eb0078f44eb5fc4570fcee26c5670a433ca1bb83be0cead421a4a03e7d838ff5') + +build() { + cd $pkgname-$pkgver + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/libsocialweb \ + --enable-all-services=yes \ + --with-online=networkmanager \ + --enable-vala-bindings + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/libsoup/PKGBUILD b/testing/libsoup/PKGBUILD new file mode 100644 index 000000000..27452ba7b --- /dev/null +++ b/testing/libsoup/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 155210 2012-04-01 11:35:42Z heftig $ +# Maintainer: Jan de Groot + +pkgbase=libsoup +pkgname=('libsoup' 'libsoup-gnome') +pkgver=2.38.0 +pkgrel=1 +arch=('i686' 'x86_64') +license=('LGPL') +makedepends=('glib2' 'libxml2' 'sqlite3' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +options=('!libtool' '!emptydirs') +sha256sums=('8fc1470309aacfc45842ec774b5a5de1848d3d59f7c467efaca555b21bef96ad') + +build() { + cd "$pkgbase-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package_libsoup() { + pkgdesc="GNOME HTTP Library - base library" + depends=('glib2' 'libxml2' 'glib-networking') + + cd "$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + + rm -f "$pkgdir"/usr/lib/libsoup-gnome-2.4.* + rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-gnome-2.4.pc" + rm -rf "$pkgdir/usr/include/libsoup-gnome-2.4" + rm -f "$pkgdir/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib" +} + +package_libsoup-gnome() { + pkgdesc="GNOME HTTP Library - GNOME libraries" + depends=("libsoup=$pkgver" 'libgnome-keyring') + + cd "$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + + rm -f "$pkgdir"/usr/lib/libsoup-2.4.* + rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-2.4.pc" + rm -rf "$pkgdir/usr/include/libsoup-2.4" + rm -rf "$pkgdir/usr/share" + rm -f "$pkgdir/usr/lib/girepository-1.0/Soup-2.4.typelib" +} diff --git a/testing/libwacom/PKGBUILD b/testing/libwacom/PKGBUILD new file mode 100644 index 000000000..eca913c84 --- /dev/null +++ b/testing/libwacom/PKGBUILD @@ -0,0 +1,25 @@ +# $Id: PKGBUILD 155212 2012-04-01 11:35:46Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=libwacom +pkgver=0.4 +pkgrel=1 +pkgdesc="Library to identify Wacom tablets and their features" +arch=('x86_64' 'i686') +depends=('glib2' 'udev') +license=('LGPL') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +url="http://www.gnome.org" +sha256sums=('13a7989572126b7f9013f8289b7e59707e23690fbd5eaa7f033b88245fa12367') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/libwebkit/PKGBUILD b/testing/libwebkit/PKGBUILD new file mode 100644 index 000000000..647bf5e9d --- /dev/null +++ b/testing/libwebkit/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 155214 2012-04-01 11:35:48Z heftig $ +# Maintainer: Andreas Radke + +pkgbase=libwebkit +pkgname=(libwebkit libwebkit3) +pkgver=1.8.0 +pkgrel=1 +pkgdesc="An opensource web content engine" +arch=('i686' 'x86_64') +url="http://webkitgtk.org/" +license=('custom') +depends=('libxt' 'libxslt' 'sqlite3' 'icu' 'gstreamer0.10-base' 'libsoup' 'enchant' 'libgl' + 'geoclue') +makedepends=('gperf' 'gobject-introspection' 'python2' 'gtk2' 'gtk3' 'mesa') +options=('!libtool' '!emptydirs') +source=(http://webkitgtk.org/releases/webkit-$pkgver.tar.xz) +sha256sums=('8cebd53b412ae9eb192493ad8e41fa8739a7b1a00f74c6b5a69d367709a801bc') + +build() { + cd "$srcdir/webkit-$pkgver" + mkdir build-gtk{2,3} + + # clear makeflags: race during introspection. + # WebKit*.gir should be created before WebKit*.typelib, but isn't + MAKEFLAGS= + + ( cd build-gtk2 && _build --with-gtk=2.0 ) + ( cd build-gtk3 && _build --with-gtk=3.0 ) +} + +_build() { + PYTHON=/usr/bin/python2 ../configure --prefix=/usr \ + --enable-introspection \ + --with-font-backend=freetype \ + --with-unicode-backend=icu \ + --enable-spellcheck "$@" + make all stamp-po +} + +package_libwebkit() { + pkgdesc+=" (for GTK2)" + depends+=(gtk2) + + cd "$srcdir/webkit-$pkgver/build-gtk2" + make DESTDIR="$pkgdir" install + install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit/LICENSE" +} + +package_libwebkit3() { + pkgdesc+=" (for GTK3)" + depends+=(gtk3) + + cd "$srcdir/webkit-$pkgver/build-gtk3" + make DESTDIR="$pkgdir" install + install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/libwebkit3/LICENSE" +} + + + diff --git a/testing/libwnck3/PKGBUILD b/testing/libwnck3/PKGBUILD new file mode 100644 index 000000000..00f383b99 --- /dev/null +++ b/testing/libwnck3/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 155216 2012-04-01 11:35:51Z heftig $ +# Maintainer: Ionut Biru + +pkgname=libwnck3 +_pkgbasename=libwnck +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Window Navigator Construction Kit (GTK+3)" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('gtk3' 'startup-notification' 'libxres') +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=('34a97edf601ee066204bb640b23f58d6897e0f559ce1816b3c1d206d70ea62ad') + +build() { + cd "$_pkgbasename-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "$_pkgbasename-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/libxklavier/PKGBUILD b/testing/libxklavier/PKGBUILD new file mode 100644 index 000000000..b2ade285b --- /dev/null +++ b/testing/libxklavier/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 155218 2012-04-01 11:35:55Z heftig $ +# Maintainer: Jan de Groot +# Contributor: Arjan Timmerman + +pkgname=libxklavier +pkgver=5.2.1 +pkgrel=2 +pkgdesc="High-level API for X Keyboard Extension" +arch=(i686 x86_64) +license=('LGPL') +depends=('glib2' 'libxkbfile' 'libxml2' 'xkeyboard-config' 'libxi' 'iso-codes') +makedepends=('gobject-introspection') +options=('!libtool' '!emptydirs') +url="http://gswitchit.sourceforge.net" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('a7a1ca8ae493fb652e3456a6b3a0b07514447161aab41feed96b968f2d338b5e') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --with-xkb-base=/usr/share/X11/xkb --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/mash/PKGBUILD b/testing/mash/PKGBUILD new file mode 100644 index 000000000..f9ab28b01 --- /dev/null +++ b/testing/mash/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 155220 2012-04-01 11:35:57Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=mash +pkgver=0.2.0 +pkgrel=1 +pkgdesc="A small library for using 3D models within a Clutter scene" +arch=('i686' 'x86_64') +url="http://clutter-project.org/" +options=('!libtool') +license=('LGPL') +depends=('clutter') +makedepends=('gtk-doc' 'gobject-introspection') +source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('fd4089e2974a1a57f9ba209a0a47924ed157da9fc9a3d65f68a6b9fdca353ccc') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/metacity/PKGBUILD b/testing/metacity/PKGBUILD new file mode 100644 index 000000000..cb68deb9e --- /dev/null +++ b/testing/metacity/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 155222 2012-04-01 11:36:00Z heftig $ +# Maintainer: Jan de Groot + +pkgname=metacity +pkgver=2.34.3 +pkgrel=1 +pkgdesc="A window manager for GNOME" +arch=(i686 x86_64) +license=('GPL') +depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra' 'libgtop' 'libsm' 'startup-notification' 'zenity') +makedepends=('intltool' 'gnome-doc-utils') +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) +sha256sums=('aeac2548b62a98375fb5c832ee26ab4cb6d59f0dd96edcefb5f7bef2416576e7') + +build() { + cd "$pkgname-$pkgver" + ./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/testing/metacity/metacity.install b/testing/metacity/metacity.install new file mode 100644 index 000000000..ba0feffc1 --- /dev/null +++ b/testing/metacity/metacity.install @@ -0,0 +1,19 @@ +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/testing/mousetweaks/PKGBUILD b/testing/mousetweaks/PKGBUILD new file mode 100644 index 000000000..be243fcd6 --- /dev/null +++ b/testing/mousetweaks/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 2392 2008-06-01 19:38:25Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=mousetweaks +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Mouse accessibility enhancements for the GNOME desktop" +arch=(i686 x86_64) +license=('GPL3' 'FDL') +depends=('libxtst' 'gtk3' 'gsettings-desktop-schemas') +makedepends=('gnome-doc-utils' 'intltool') +groups=('gnome-extra') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +install=mousetweaks.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('f44711d47fb6fb6286ca46c144bbdc791e39c5062f923b55e9e300844d317144') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/testing/mousetweaks/mousetweaks.install b/testing/mousetweaks/mousetweaks.install new file mode 100644 index 000000000..1ae919322 --- /dev/null +++ b/testing/mousetweaks/mousetweaks.install @@ -0,0 +1,17 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall mousetweaks + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/mutter/PKGBUILD b/testing/mutter/PKGBUILD new file mode 100644 index 000000000..18409d441 --- /dev/null +++ b/testing/mutter/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 155226 2012-04-01 11:36:07Z heftig $ +# Maintainer: Jan "heftig" Steffens +# Maintainer: Ionut Biru +# Contributor: Michael Kanis + +pkgname=mutter +pkgver=3.4.0 +pkgrel=1 +pkgdesc="A window manager for GNOME" +arch=(i686 x86_64) +license=('GPL') +depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity') +makedepends=('intltool' 'gnome-doc-utils') +url="http://www.gnome.org" +groups=('gnome') +options=('!libtool' '!emptydirs') +install=mutter.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('6aa8a91ec7f20eee20b8fd9f93a9529c5a530c21b607ec6656bb9c8b80190431') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/mutter \ + --localstatedir=/var --disable-static \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/mutter/mutter.install b/testing/mutter/mutter.install new file mode 100644 index 000000000..c47f1cef2 --- /dev/null +++ b/testing/mutter/mutter.install @@ -0,0 +1,19 @@ +pkgname=mutter + +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/testing/mx/PKGBUILD b/testing/mx/PKGBUILD new file mode 100644 index 000000000..5a840a2ce --- /dev/null +++ b/testing/mx/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 155228 2012-04-01 11:36:09Z heftig $ +# Contributor: Andrea Scarpino +# Contributor: Guenther Wutz + +pkgname=mx +pkgver=1.4.3 +pkgrel=2 +pkgdesc="A widget toolkit using Clutter" +arch=('i686' 'x86_64') +url="http://www.clutter-project.org" +license=('LGPL') +depends=('clutter' 'libxrandr' 'dbus-glib' 'gtk2' 'startup-notification') +makedepends=('intltool' 'gobject-introspection' 'gtk-doc') +options=('!libtool') +source=("http://source.clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz") +sha256sums=('d0c259a7bcaf130a17cef00ed4c7118287f05790a6b50bcffa02668130336eb5') + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix=/usr + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/testing/nautilus-sendto/PKGBUILD b/testing/nautilus-sendto/PKGBUILD new file mode 100644 index 000000000..cad7c5013 --- /dev/null +++ b/testing/nautilus-sendto/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 155232 2012-04-01 11:36:16Z heftig $ +# Maintainer: Jan de Groot +# Contributor: Eduardo Romero +# Contributor: Tor Krill + +pkgname=nautilus-sendto +pkgver=3.0.2 +pkgrel=1 +pkgdesc="Nautilus context menu for sending files." +arch=('i686' 'x86_64') +url="http://download.gnome.org/sources/nautilus-sendto/" +license=('GPL') +groups=('gnome-extra') +depends=('evolution-data-server' 'nautilus' 'dconf') +makedepends=('pidgin' 'gajim' 'gettext' 'intltool') +options=('!libtool' '!emptydirs') +install=nautilus-sendto.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('03265d7063212717773bd6a1f85c25ec24066ca8424b658c5fa30ec0fb074b44') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/nautilus-sendto/nautilus-sendto.install b/testing/nautilus-sendto/nautilus-sendto.install new file mode 100644 index 000000000..d33a1b261 --- /dev/null +++ b/testing/nautilus-sendto/nautilus-sendto.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/nautilus/PKGBUILD b/testing/nautilus/PKGBUILD new file mode 100644 index 000000000..ade197593 --- /dev/null +++ b/testing/nautilus/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 155230 2012-04-01 11:36:11Z heftig $ +# Maintainer: Jan de Groot + +pkgname=nautilus +pkgver=3.4.0 +pkgrel=1 +pkgdesc="GNOME file manager" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify') +makedepends=('intltool' 'gobject-introspection') +url="http://www.gnome.org" +groups=('gnome') +options=('!libtool' '!emptydirs') +install=nautilus.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('abdc8e84a42ab69158beedeec5b2b960a8bf899fb2b40ad162270223e1f243a3') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/nautilus \ + --disable-nst-extension \ + --disable-update-mimedb \ + --disable-packagekit \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/nautilus/nautilus.install b/testing/nautilus/nautilus.install new file mode 100644 index 000000000..631e38649 --- /dev/null +++ b/testing/nautilus/nautilus.install @@ -0,0 +1,20 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime > /dev/null +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall nautilus + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/network-manager-applet/PKGBUILD b/testing/network-manager-applet/PKGBUILD new file mode 100644 index 000000000..b9e4d1169 --- /dev/null +++ b/testing/network-manager-applet/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 155236 2012-04-01 11:36:25Z heftig $ +# Maintainer: Jan de Groot +# Contributor: Arjan Timmerman +# Contributor: Wael Nasreddine +# Contributor: Tor Krill +# Contributor: Will Rea + +pkgname=network-manager-applet +pkgver=0.9.4.1 +pkgrel=1 +pkgdesc="GNOME frontends to NetWorkmanager" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=('networkmanager' 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' 'gnome-icon-theme' + 'mobile-broadband-provider-info' 'gconf' 'iso-codes') +makedepends=('intltool' 'gnome-bluetooth') +optdepends=('gnome-bluetooth: for PAN/DUN support') +options=('!libtool' '!emptydirs') +install=network-manager-applet.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz) +sha256sums=('b6b6de75e28d1fbcdfdbb51c0e40fcd6bc0ec0385bfecd16c457260491cd2ff7') + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/networkmanager \ + --disable-static \ + --disable-maintainer-mode + 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 nm-applet ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/testing/network-manager-applet/network-manager-applet.install b/testing/network-manager-applet/network-manager-applet.install new file mode 100644 index 000000000..9922d12b2 --- /dev/null +++ b/testing/network-manager-applet/network-manager-applet.install @@ -0,0 +1,18 @@ +pkgname=network-manager-applet + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} diff --git a/testing/networkmanager-openconnect/PKGBUILD b/testing/networkmanager-openconnect/PKGBUILD new file mode 100644 index 000000000..a522b2d9b --- /dev/null +++ b/testing/networkmanager-openconnect/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 155238 2012-04-01 11:36:27Z heftig $ +# Maintainer: Ionut Biru + +pkgname=networkmanager-openconnect +pkgver=0.9.4.0 +pkgrel=1 +pkgdesc="NetworkManager VPN integration for openconnect" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=("networkmanager>=${pkgver}" 'openconnect' 'gconf') +makedepends=('intltool') +optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') +options=('!libtool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz) +sha256sums=('60732587befd062fb8d979540c4410831f5e686b5d092ec24b0237ebd09e1084') + +build() { + cd NetworkManager-openconnect-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/networkmanager \ + --disable-static + make +} + +package() { + cd NetworkManager-openconnect-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/testing/networkmanager-openconnect/networkmanager-openconnect.install b/testing/networkmanager-openconnect/networkmanager-openconnect.install new file mode 100644 index 000000000..7bd4d44f9 --- /dev/null +++ b/testing/networkmanager-openconnect/networkmanager-openconnect.install @@ -0,0 +1,16 @@ +pkgname=networkmanager-openconnect + +post_install() { + getent group nm-openconnect >/dev/null 2>&1 || groupadd -g 104 nm-openconnect + getent passwd nm-openconnect > /dev/null 2>&1 || useradd -u 104 -s /sbin/nologin -d / -M -c 'NetworkManager user for OpenConnect' -g nm-openconnect nm-openconnect + passwd -l nm-openconnect > /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + getent passwd nm-openconnect >/dev/null 2>&1 && userdel nm-openconnect + getent group nm-openconnect >/dev/null 2>&1 && groupdel nm-openconnect +} diff --git a/testing/networkmanager-openvpn/PKGBUILD b/testing/networkmanager-openvpn/PKGBUILD new file mode 100644 index 000000000..120d97b8d --- /dev/null +++ b/testing/networkmanager-openvpn/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 155240 2012-04-01 11:36:31Z heftig $ +# Maintainer: Ionut Biru + +pkgname=networkmanager-openvpn +pkgver=0.9.4.0 +pkgrel=1 +pkgdesc="NetworkManager VPN plugin for OpenVPN" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=("networkmanager>=${pkgver}" 'openvpn' 'gtk3' 'libgnome-keyring') +makedepends=('intltool') +optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') +install=networkmanager-openvpn.install +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz) +sha256sums=('d04870b10c2cd3a0671a4be645f595ad0362bcfd23cb849690b27bbac53683e0') + +build() { + cd NetworkManager-openvpn-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/networkmanager \ + --disable-static + make +} + +package() { + cd NetworkManager-openvpn-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/testing/networkmanager-openvpn/networkmanager-openvpn.install b/testing/networkmanager-openvpn/networkmanager-openvpn.install new file mode 100644 index 000000000..931c0517c --- /dev/null +++ b/testing/networkmanager-openvpn/networkmanager-openvpn.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/networkmanager-pptp/PKGBUILD b/testing/networkmanager-pptp/PKGBUILD new file mode 100644 index 000000000..0b08f631c --- /dev/null +++ b/testing/networkmanager-pptp/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 155242 2012-04-01 11:36:35Z heftig $ +# Maintainer: Ionut Biru + +pkgname=networkmanager-pptp +pkgver=0.9.4.0 +pkgrel=1 +pkgdesc="NetworkManager VPN plugin for pptp " +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=("networkmanager>=${pkgver}" 'pptpclient' 'gtk3' 'libgnome-keyring') +makedepends=('intltool') +optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') +options=('!libtool') +install=networkmanager-pptp.install +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz) +sha256sums=('6fb772985a7273793296375d0ecba59362fe5575f70a8dd36da622db8a8d235d') + +build() { + cd NetworkManager-pptp-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/networkmanager \ + --disable-static + make +} + +package() { + cd NetworkManager-pptp-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/testing/networkmanager-pptp/networkmanager-pptp.install b/testing/networkmanager-pptp/networkmanager-pptp.install new file mode 100644 index 000000000..931c0517c --- /dev/null +++ b/testing/networkmanager-pptp/networkmanager-pptp.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/networkmanager-vpnc/PKGBUILD b/testing/networkmanager-vpnc/PKGBUILD new file mode 100644 index 000000000..a380530db --- /dev/null +++ b/testing/networkmanager-vpnc/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 155244 2012-04-01 11:36:37Z heftig $ +# Maintainer: Ionut Biru + +pkgname=networkmanager-vpnc +pkgver=0.9.4.0 +pkgrel=1 +pkgdesc="NetworkManager VPN plugin for vpnc" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/NetworkManager/" +depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme' 'gtk3' 'libgnome-keyring') +makedepends=('intltool') +optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') +options=('!libtool') +install=networkmanager-vpnc.install +source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz) +sha256sums=('1d52720ce39bd772753a40c879d0a654fc2efcc4ef7b49ec18f55ae2e82efc7d') + +build() { + cd NetworkManager-vpnc-${pkgver} + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/networkmanager \ + --disable-static + make +} + +package() { + cd NetworkManager-vpnc-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/testing/networkmanager-vpnc/networkmanager-vpnc.install b/testing/networkmanager-vpnc/networkmanager-vpnc.install new file mode 100644 index 000000000..931c0517c --- /dev/null +++ b/testing/networkmanager-vpnc/networkmanager-vpnc.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/testing/networkmanager/PKGBUILD b/testing/networkmanager/PKGBUILD index d62f0f92c..7158bca39 100644 --- a/testing/networkmanager/PKGBUILD +++ b/testing/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 150320 2012-02-16 20:41:49Z heftig $ +# $Id: PKGBUILD 155234 2012-04-01 11:36:20Z heftig $ # Maintainer: Jan de Groot # Contri-butor: Wael Nasreddine # Contributor: Tor Krill @@ -6,13 +6,15 @@ # Contributor: Valentine Sinitsyn pkgname=networkmanager -pkgver=0.9.2.0 -pkgrel=2 +_pkgname=NetworkManager +pkgver=0.9.4.0 +pkgrel=1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') license=('GPL') -url="http://www.gnome.org/projects/NetworkManager/" -depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wireless_tools' 'wpa_supplicant' 'ppp' 'dhcpcd') +url="http://www.gnome.org/projects/$_pkgname/" +depends=('dbus-glib' 'iproute2' 'libnl' 'nss' 'polkit' 'udev' 'wpa_supplicant' 'ppp' 'dhcpcd' + 'libsystemd' 'libsoup') makedepends=('intltool' 'dhclient' 'iptables' 'gobject-introspection') optdepends=('modemmanager: for modem management service' 'dhclient: alternative DHCP/DHCPv6 client' @@ -23,16 +25,22 @@ optdepends=('modemmanager: for modem management service' options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install -source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz - NetworkManager.conf disable_set_hostname.patch) -sha256sums=('437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf' +#source=(http://cgit.freedesktop.org/$_pkgname/$_pkgname/snapshot/$_pkgname-master.tar.xz +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz + NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch systemd-fallback.patch) +sha256sums=('eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' - '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460') + '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' + '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb' + '5e9bbd8a84883037d27a71ea9969d0cb03f09ca238fa733381bcf136bbc340a5') build() { - cd "${srcdir}/NetworkManager-${pkgver}" + cd $_pkgname-$pkgver - patch -Np1 -i "${srcdir}/disable_set_hostname.patch" + patch -Np1 -i ../disable_set_hostname.patch + patch -Np1 -i ../dnsmasq-path.patch + patch -Np1 -i ../systemd-fallback.patch + AUTOPOINT='intltoolize --automake --copy' autoreconf -f -i ./configure \ --prefix=/usr \ @@ -46,6 +54,8 @@ build() { --with-iptables=/usr/sbin/iptables \ --with-systemdsystemunitdir=/lib/systemd/system \ --with-resolvconf=/usr/sbin/resolvconf \ + --with-session-tracking=systemd \ + --with-wext=no \ --disable-static \ --enable-more-warnings=no \ --disable-wimax @@ -54,10 +64,10 @@ build() { } package() { - cd "${srcdir}/NetworkManager-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $_pkgname-$pkgver + make DESTDIR="$pkgdir" install - install -m644 "${srcdir}/NetworkManager.conf" "${pkgdir}/etc/NetworkManager/" + install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" - rm -rf "${pkgdir}/var/run/" + rm -r "$pkgdir/var/run" } diff --git a/testing/networkmanager/dnsmasq-path.patch b/testing/networkmanager/dnsmasq-path.patch new file mode 100644 index 000000000..c0e713266 --- /dev/null +++ b/testing/networkmanager/dnsmasq-path.patch @@ -0,0 +1,30 @@ +diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c +--- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c 2011-10-10 23:38:20.000000000 +0200 ++++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c 2012-03-06 09:07:24.137460927 +0100 +@@ -52,8 +52,11 @@ + find_dnsmasq (void) + { + static const char *paths[] = { ++ "/usr/local/bin/dnsmasq", + "/usr/local/sbin/dnsmasq", ++ "/usr/bin/dnsmasq", + "/usr/sbin/dnsmasq", ++ "/bin/dnsmasq", + "/sbin/dnsmasq", + NULL + }; +diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c +--- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c 2011-04-19 07:06:22.000000000 +0200 ++++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c 2012-03-06 09:07:58.603851818 +0100 +@@ -170,8 +170,11 @@ + nm_find_dnsmasq (void) + { + static const char *dnsmasq_binary_paths[] = { ++ "/usr/local/bin/dnsmasq", + "/usr/local/sbin/dnsmasq", ++ "/usr/bin/dnsmasq", + "/usr/sbin/dnsmasq", ++ "/bin/dnsmasq", + "/sbin/dnsmasq", + NULL + }; diff --git a/testing/networkmanager/systemd-fallback.patch b/testing/networkmanager/systemd-fallback.patch new file mode 100644 index 000000000..f5acc9dc6 --- /dev/null +++ b/testing/networkmanager/systemd-fallback.patch @@ -0,0 +1,470 @@ +diff -u -Nr NetworkManager-0.9.3.995/configure.ac NetworkManager-0.9.3.995-systemd-fallback/configure.ac +--- NetworkManager-0.9.3.995/configure.ac 2012-03-02 01:05:21.000000000 +0100 ++++ NetworkManager-0.9.3.995-systemd-fallback/configure.ac 2012-03-06 16:55:58.294793902 +0100 +@@ -344,7 +344,7 @@ + case $with_session_tracking in + ck|none) ;; + systemd) +- PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login]) ++ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login]) + ;; + *) + AC_MSG_ERROR(--with-session-tracking must be one of [none, ck, systemd]) +diff -u -Nr NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c +--- NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c 2012-02-27 16:57:16.000000000 +0100 ++++ NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c 2012-03-06 16:55:01.285264295 +0100 +@@ -28,6 +28,10 @@ + #include + #include + #include ++#include ++#include ++#include ++#include "nm-logging.h" + + #include "nm-session-utils.h" + #include "nm-session-monitor.h" +@@ -107,10 +111,20 @@ + return source; + } + ++/********************************************************************/ ++ ++#define CKDB_PATH "/var/run/ConsoleKit/database" ++ + struct _NMSessionMonitor { + GObject parent_instance; + + GSource *sd_source; ++ ++ GKeyFile *database; ++ GFileMonitor *database_monitor; ++ time_t database_mtime; ++ GHashTable *sessions_by_uid; ++ GHashTable *sessions_by_user; + }; + + struct _NMSessionMonitorClass { +@@ -130,6 +144,215 @@ + + /* ---------------------------------------------------------------------------------------------------- */ + ++typedef struct { ++ char *user; ++ uid_t uid; ++ gboolean local; ++ gboolean active; ++} Session; ++ ++static void ++session_free (Session *s) ++{ ++ g_free (s->user); ++ memset (s, 0, sizeof (Session)); ++ g_free (s); ++} ++ ++static gboolean ++check_key (GKeyFile *keyfile, const char *group, const char *key, GError **error) ++{ ++ if (g_key_file_has_key (keyfile, group, key, error)) ++ return TRUE; ++ ++ if (!error) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE, ++ "ConsoleKit database " CKDB_PATH " group '%s' had no '%s' key", ++ group, key); ++ } ++ return FALSE; ++} ++ ++static Session * ++session_new (GKeyFile *keyfile, const char *group, GError **error) ++{ ++ GError *local = NULL; ++ Session *s; ++ const char *uname = NULL; ++ ++ s = g_new0 (Session, 1); ++ g_assert (s); ++ ++ s->uid = G_MAXUINT; /* paranoia */ ++ if (!check_key (keyfile, group, "uid", &local)) ++ goto error; ++ s->uid = (uid_t) g_key_file_get_integer (keyfile, group, "uid", &local); ++ if (local) ++ goto error; ++ ++ if (!check_key (keyfile, group, "is_active", &local)) ++ goto error; ++ s->active = g_key_file_get_boolean (keyfile, group, "is_active", &local); ++ if (local) ++ goto error; ++ ++ if (!check_key (keyfile, group, "is_local", &local)) ++ goto error; ++ s->local = g_key_file_get_boolean (keyfile, group, "is_local", &local); ++ if (local) ++ goto error; ++ ++ if (!nm_session_uid_to_user (s->uid, &uname, error)) ++ return FALSE; ++ s->user = g_strdup (uname); ++ ++ return s; ++ ++error: ++ session_free (s); ++ g_propagate_error (error, local); ++ return NULL; ++} ++ ++static void ++session_merge (Session *src, Session *dest) ++{ ++ g_return_if_fail (src != NULL); ++ g_return_if_fail (dest != NULL); ++ ++ g_warn_if_fail (g_strcmp0 (src->user, dest->user) == 0); ++ g_warn_if_fail (src->uid == dest->uid); ++ ++ dest->local = (dest->local || src->local); ++ dest->active = (dest->active || src->active); ++} ++ ++/********************************************************************/ ++ ++static void ++free_database (NMSessionMonitor *self) ++{ ++ if (self->database != NULL) { ++ g_key_file_free (self->database); ++ self->database = NULL; ++ } ++ ++ g_hash_table_remove_all (self->sessions_by_uid); ++ g_hash_table_remove_all (self->sessions_by_user); ++} ++ ++static gboolean ++reload_database (NMSessionMonitor *self, GError **error) ++{ ++ struct stat statbuf; ++ char **groups = NULL; ++ gsize len = 0, i; ++ Session *s; ++ ++ free_database (self); ++ ++ errno = 0; ++ if (stat (CKDB_PATH, &statbuf) != 0) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR, ++ "Error statting file " CKDB_PATH ": %s", ++ strerror (errno)); ++ goto error; ++ } ++ self->database_mtime = statbuf.st_mtime; ++ ++ self->database = g_key_file_new (); ++ if (!g_key_file_load_from_file (self->database, CKDB_PATH, G_KEY_FILE_NONE, error)) ++ goto error; ++ ++ groups = g_key_file_get_groups (self->database, &len); ++ if (!groups) { ++ g_set_error_literal (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_IO_ERROR, ++ "Could not load groups from " CKDB_PATH ""); ++ goto error; ++ } ++ ++ for (i = 0; i < len; i++) { ++ Session *found; ++ ++ if (!g_str_has_prefix (groups[i], "Session ")) ++ continue; ++ ++ s = session_new (self->database, groups[i], error); ++ if (!s) ++ goto error; ++ ++ found = g_hash_table_lookup (self->sessions_by_user, (gpointer) s->user); ++ if (found) { ++ session_merge (s, found); ++ session_free (s); ++ } else { ++ /* Entirely new user */ ++ g_hash_table_insert (self->sessions_by_user, (gpointer) s->user, s); ++ g_hash_table_insert (self->sessions_by_uid, GUINT_TO_POINTER (s->uid), s); ++ } ++ } ++ ++ g_strfreev (groups); ++ return TRUE; ++ ++error: ++ if (groups) ++ g_strfreev (groups); ++ free_database (self); ++ return FALSE; ++} ++ ++static gboolean ++ensure_database (NMSessionMonitor *self, GError **error) ++{ ++ gboolean ret = FALSE; ++ ++ if (self->database != NULL) { ++ struct stat statbuf; ++ ++ errno = 0; ++ if (stat (CKDB_PATH, &statbuf) != 0) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR, ++ "Error statting file " CKDB_PATH " to check timestamp: %s", ++ strerror (errno)); ++ goto out; ++ } ++ ++ if (statbuf.st_mtime == self->database_mtime) { ++ ret = TRUE; ++ goto out; ++ } ++ } ++ ++ ret = reload_database (self, error); ++ ++out: ++ return ret; ++} ++ ++static void ++on_file_monitor_changed (GFileMonitor * file_monitor, ++ GFile * file, ++ GFile * other_file, ++ GFileMonitorEvent event_type, ++ gpointer user_data) ++{ ++ NMSessionMonitor *self = NM_SESSION_MONITOR (user_data); ++ ++ /* throw away cache */ ++ free_database (self); ++ ++ g_signal_emit (self, signals[CHANGED_SIGNAL], 0); ++} ++ + static gboolean + sessions_changed (gpointer user_data) + { +@@ -143,9 +366,50 @@ + static void + nm_session_monitor_init (NMSessionMonitor *monitor) + { +- monitor->sd_source = sd_source_new (); +- g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); +- g_source_attach (monitor->sd_source, NULL); ++ if (sd_booted () > 0) { ++ monitor->sd_source = sd_source_new (); ++ g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL); ++ g_source_attach (monitor->sd_source, NULL); ++ ++ monitor->database_monitor = NULL; ++ monitor->database = NULL; ++ } else { ++ monitor->sd_source = NULL; ++ ++ GError *error = NULL; ++ GFile *file; ++ ++ /* Sessions-by-user is responsible for destroying the Session objects */ ++ monitor->sessions_by_user = g_hash_table_new_full (g_str_hash, g_str_equal, ++ NULL, (GDestroyNotify) session_free); ++ monitor->sessions_by_uid = g_hash_table_new (g_direct_hash, g_direct_equal); ++ ++ ++ error = NULL; ++ if (!ensure_database (monitor, &error)) { ++ /* Ignore the first error if the CK database isn't found yet */ ++ if (g_error_matches (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_NO_DATABASE) == FALSE) { ++ nm_log_err (LOGD_CORE, "Error loading " CKDB_PATH ": %s", error->message); ++ } ++ g_error_free (error); ++ } ++ ++ error = NULL; ++ file = g_file_new_for_path (CKDB_PATH); ++ monitor->database_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error); ++ g_object_unref (file); ++ if (monitor->database_monitor == NULL) { ++ nm_log_err (LOGD_CORE, "Error monitoring " CKDB_PATH ": %s", error->message); ++ g_error_free (error); ++ } else { ++ g_signal_connect (monitor->database_monitor, ++ "changed", ++ G_CALLBACK (on_file_monitor_changed), ++ monitor); ++ } ++ } + } + + static void +@@ -158,6 +422,12 @@ + g_source_unref (monitor->sd_source); + } + ++ if (monitor->database_monitor != NULL) ++ g_object_unref (monitor->database_monitor); ++ ++ if (monitor->database != NULL) ++ free_database (monitor); ++ + if (G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize != NULL) + G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize (object); + } +@@ -206,15 +476,36 @@ + uid_t *out_uid, + GError **error) + { +- uid_t uid; ++ if (monitor->sd_source != NULL) { ++ uid_t uid; + +- if (!nm_session_user_to_uid (username, &uid, error)) +- return FALSE; ++ if (!nm_session_user_to_uid (username, &uid, error)) ++ return FALSE; + +- if (out_uid) +- *out_uid = uid; ++ if (out_uid) ++ *out_uid = uid; + +- return nm_session_monitor_uid_has_session (monitor, uid, NULL, error); ++ return nm_session_monitor_uid_has_session (monitor, uid, NULL, error); ++ } else { ++ Session *s; ++ ++ if (!ensure_database (monitor, error)) ++ return FALSE; ++ ++ s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username); ++ if (!s) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, ++ "No session found for user '%s'", ++ username); ++ return FALSE; ++ } ++ ++ if (out_uid) ++ *out_uid = s->uid; ++ return TRUE; ++ } + } + + gboolean +@@ -222,12 +513,31 @@ + const char *username, + GError **error) + { +- uid_t uid; ++ if (monitor->sd_source != NULL) { ++ uid_t uid; + +- if (!nm_session_user_to_uid (username, &uid, error)) +- return FALSE; ++ if (!nm_session_user_to_uid (username, &uid, error)) ++ return FALSE; ++ ++ return nm_session_monitor_uid_active (monitor, uid, error); ++ } else { ++ Session *s; ++ ++ if (!ensure_database (monitor, error)) ++ return FALSE; ++ ++ s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username); ++ if (!s) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, ++ "No session found for user '%s'", ++ username); ++ return FALSE; ++ } + +- return nm_session_monitor_uid_active (monitor, uid, error); ++ return s->active; ++ } + } + + gboolean +@@ -236,10 +546,31 @@ + const char **out_user, + GError **error) + { +- if (!nm_session_uid_to_user (uid, out_user, error)) +- return FALSE; ++ if (monitor->sd_source != NULL) { ++ if (!nm_session_uid_to_user (uid, out_user, error)) ++ return FALSE; + +- return sd_uid_get_sessions (uid, FALSE, NULL) > 0; ++ return sd_uid_get_sessions (uid, FALSE, NULL) > 0; ++ } else { ++ Session *s; ++ ++ if (!ensure_database (monitor, error)) ++ return FALSE; ++ ++ s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid)); ++ if (!s) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, ++ "No session found for uid %d", ++ uid); ++ return FALSE; ++ } ++ ++ if (out_user) ++ *out_user = s->user; ++ return TRUE; ++ } + } + + gboolean +@@ -247,5 +578,24 @@ + uid_t uid, + GError **error) + { +- return sd_uid_get_sessions (uid, TRUE, NULL) > 0; ++ if (monitor->sd_source != NULL) ++ return sd_uid_get_sessions (uid, TRUE, NULL) > 0; ++ else { ++ Session *s; ++ ++ if (!ensure_database (monitor, error)) ++ return FALSE; ++ ++ s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid)); ++ if (!s) { ++ g_set_error (error, ++ NM_SESSION_MONITOR_ERROR, ++ NM_SESSION_MONITOR_ERROR_UNKNOWN_USER, ++ "No session found for uid '%d'", ++ uid); ++ return FALSE; ++ } ++ ++ return s->active; ++ } + } diff --git a/testing/pango/PKGBUILD b/testing/pango/PKGBUILD new file mode 100644 index 000000000..4519e8b54 --- /dev/null +++ b/testing/pango/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 155247 2012-04-01 11:36:43Z heftig $ +# Maintainer: Jan de Groot + +pkgname=pango +pkgver=1.30.0 +pkgrel=1 +pkgdesc="A library for layout and rendering of text" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('glib2' 'cairo' 'libxft' 'libthai' 'freetype2') +makedepends=('gobject-introspection' 'libxt' 'gtk-doc') +options=('!libtool' '!emptydirs') +install=pango.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) +url="http://www.pango.org/" +sha256sums=('7c6d2ab024affaed0e942f9279b818235f9c6a36d9fc50688f48d387f4102dff') + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --with-included-modules=basic-fc + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/testing/pango/pango.install b/testing/pango/pango.install new file mode 100644 index 000000000..73b0f5bf1 --- /dev/null +++ b/testing/pango/pango.install @@ -0,0 +1,21 @@ +# arg 1: the new package version +post_install() { + # we need to ldconfig first, in case xfree86's libs aren't + # in ld.so.cache yet + sbin/ldconfig -r . + usr/bin/pango-querymodules >etc/pango/pango.modules +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ -f usr/etc/pango/pango.modules ]; then + rm usr/etc/pango/pango.modules + fi + post_install $1 +} + +# arg 1: the old package version +pre_remove() { + rm etc/pango/pango.modules +} diff --git a/testing/pcmciautils/PKGBUILD b/testing/pcmciautils/PKGBUILD index 3016b5667..e8acc5a2e 100644 --- a/testing/pcmciautils/PKGBUILD +++ b/testing/pcmciautils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153429 2012-03-13 20:10:33Z tomegun $ +# $Id: PKGBUILD 155317 2012-04-01 19:52:53Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Tobias Powalowski pkgname=pcmciautils pkgver=018 -pkgrel=2 +pkgrel=3 pkgdesc="Utilities for inserting and removing PCMCIA cards" arch=(i686 x86_64) url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html" @@ -18,7 +18,8 @@ options=(!makeflags) build() { cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e 's,/usr/bin/install,/bin/install,g' Makefile + sed -i -e 's,/usr/bin/install,install,g; + s,/lib/udev,/usr/lib/udev,g' Makefile make } diff --git a/testing/pidgin/PKGBUILD b/testing/pidgin/PKGBUILD new file mode 100644 index 000000000..1019a0feb --- /dev/null +++ b/testing/pidgin/PKGBUILD @@ -0,0 +1,112 @@ +# $Id: PKGBUILD 155249 2012-04-01 11:36:46Z heftig $ +# Maintainer: Evangelos Foutras +# Contributor: Ionut Biru +# Contributor: Andrea Scarpino +# Contributor: Alexander Fehr +# Contributor: Lucien Immink + +pkgname=('pidgin' 'libpurple' 'finch') +pkgver=2.10.3 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://pidgin.im/" +license=('GPL') +makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' + 'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10' + 'farstream' 'avahi' 'tk' 'ca-certificates' 'intltool' + 'networkmanager') +options=('!libtool') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 + port-to-farstream-v3.patch) +sha256sums=('0f67d96231fea3945c2735e6a3b4bd92590ef489fa1511fa69aa6a543cb4168b' + '4c11c10da01855afe865408f29f514672b736830105523fe48aa74676d5052ca') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # Apply patch for farsight -> farstream transition + # http://developer.pidgin.im/ticket/14936 + patch -Np1 -i "$srcdir/port-to-farstream-v3.patch" + + # The farstream patch changes configure.ac + autoreconf -vi + + # Use Python 2 + sed -i 's/env python$/&2/' */plugins/*.py \ + libpurple/purple-{remote,notifications-example,url-handler} + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-schemas-install \ + --disable-meanwhile \ + --disable-gnutls \ + --enable-cyrus-sasl \ + --disable-doxygen \ + --enable-nm \ + --with-python=/usr/bin/python2 \ + --with-system-ssl-certs=/etc/ssl/certs + make +} + +package_pidgin(){ + pkgdesc="Multi-protocol instant messaging client" + depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm' + 'gstreamer0.10' 'hicolor-icon-theme') + optdepends=('aspell: for spelling correction' + 'ca-certificates: SSL CA certificates' + 'gstreamer0.10-good-plugins: video and voice support' + 'tk: Tcl/Tk scripting support') + install=pidgin.install + + cd "$srcdir/pidgin-$pkgver" + + # For linking + make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES + + make -C pidgin DESTDIR="$pkgdir" install + make -C doc DESTDIR="$pkgdir" install + + # Remove files that are packaged in libpurle + make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES + + install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop + + rm "$pkgdir/usr/share/man/man1/finch.1" +} + +package_libpurple(){ + pkgdesc="IM library extracted from Pidgin" + depends=('farstream' 'libsasl' 'libidn' 'dbus-glib' 'nss') + optdepends=('avahi: Bonjour protocol support' + 'dbus-python: for purple-remote and purple-url-handler') + + cd "$srcdir/pidgin-$pkgver" + + for _dir in libpurple share/sounds share/ca-certs m4macros po; do + make -C "$_dir" DESTDIR="$pkgdir" install + done +} + +package_finch(){ + pkgdesc="A ncurses-based messaging client" + depends=("libpurple=$pkgver-$pkgrel" 'python2' 'gstreamer0.10') + optdepends=('avahi: Bonjour protocol support' + 'ca-certificates: SSL CA certificates' + 'tk: Tcl/Tk scripting support') + + cd "$srcdir/pidgin-$pkgver" + + # For linking + make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES + + make -C finch DESTDIR="$pkgdir" install + make -C doc DESTDIR="$pkgdir" install + + # Remove files that are packaged in libpurle + make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES + + rm "$pkgdir"/usr/share/man/man1/pidgin.1 +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/pidgin/pidgin.install b/testing/pidgin/pidgin.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/testing/pidgin/pidgin.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/pidgin/port-to-farstream-v3.patch b/testing/pidgin/port-to-farstream-v3.patch new file mode 100644 index 000000000..93e29af50 --- /dev/null +++ b/testing/pidgin/port-to-farstream-v3.patch @@ -0,0 +1,447 @@ +diff -upr pidgin-2.10.1.orig/configure.ac pidgin-2.10.1/configure.ac +--- pidgin-2.10.1.orig/configure.ac 2011-12-06 10:44:32.000000000 +0200 ++++ pidgin-2.10.1/configure.ac 2012-03-10 18:21:12.000000000 +0200 +@@ -780,18 +780,18 @@ else + fi + + dnl ####################################################################### +-dnl # Check for Farsight ++dnl # Check for Farstream + dnl ####################################################################### +-AC_ARG_ENABLE(farsight, +- [AC_HELP_STRING([--disable-farsight], [compile without farsight support])], +- enable_farsight="$enableval", enable_farsight="yes") +-if test "x$enable_farsight" != "xno"; then +- PKG_CHECK_MODULES(FARSIGHT, [farsight2-0.10 >= 0.0.9], [ +- AC_DEFINE(USE_FARSIGHT, 1, [Use Farsight for voice and video]) +- AC_SUBST(FARSIGHT_CFLAGS) +- AC_SUBST(FARSIGHT_LIBS) ++AC_ARG_ENABLE(farstream, ++ [AC_HELP_STRING([--disable-farstream], [compile without farstream support])], ++ enable_farstream="$enableval", enable_farstream="yes") ++if test "x$enable_farstream" != "xno"; then ++ PKG_CHECK_MODULES(FARSTREAM, [farstream-0.1], [ ++ AC_DEFINE(USE_FARSTREAM, 1, [Use Farstream for voice and video]) ++ AC_SUBST(FARSTREAM_CFLAGS) ++ AC_SUBST(FARSTREAM_LIBS) + ], [ +- enable_farsight="no" ++ enable_farstream="no" + ]) + fi + +@@ -802,20 +802,20 @@ AC_ARG_ENABLE(vv, + [AC_HELP_STRING([--disable-vv], [compile without voice and video support])], + enable_vv="$enableval", enable_vv="yes") + if test "x$enable_vv" != "xno"; then +- if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno"; then ++ if test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno"; then + AC_DEFINE(USE_VV, 1, [Use voice and video]) + else + enable_vv="no" + if test "x$force_deps" = "xyes"; then + AC_MSG_ERROR([ + Dependencies for voice/video were not met. +-Install the necessary gstreamer and farsight packages first. ++Install the necessary gstreamer and farstream packages first. + Or use --disable-vv if you do not need voice/video support. + ]) + fi + fi + fi +-AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farsight" != "xno") ++AM_CONDITIONAL(USE_VV, test "x$enable_gstreamer" != "xno" -a "x$enable_gstinterfaces" != "xno" -a "x$enable_farstream" != "xno") + + dnl ####################################################################### + dnl # Check for Internationalized Domain Name support +diff -upr pidgin-2.10.1.orig/libpurple/Makefile.am pidgin-2.10.1/libpurple/Makefile.am +--- pidgin-2.10.1.orig/libpurple/Makefile.am 2011-12-06 10:44:33.000000000 +0200 ++++ pidgin-2.10.1/libpurple/Makefile.am 2012-03-10 18:21:19.000000000 +0200 +@@ -306,7 +306,7 @@ libpurple_la_LIBADD = \ + $(LIBXML_LIBS) \ + $(NETWORKMANAGER_LIBS) \ + $(INTLLIBS) \ +- $(FARSIGHT_LIBS) \ ++ $(FARSTREAM_LIBS) \ + $(GSTREAMER_LIBS) \ + $(GSTINTERFACES_LIBS) \ + $(IDN_LIBS) \ +@@ -322,7 +322,7 @@ AM_CPPFLAGS = \ + $(DEBUG_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(LIBXML_CFLAGS) \ +- $(FARSIGHT_CFLAGS) \ ++ $(FARSTREAM_CFLAGS) \ + $(GSTREAMER_CFLAGS) \ + $(GSTINTERFACES_CFLAGS) \ + $(IDN_CFLAGS) \ +diff -upr pidgin-2.10.1.orig/libpurple/media/backend-fs2.c pidgin-2.10.1/libpurple/media/backend-fs2.c +--- pidgin-2.10.1.orig/libpurple/media/backend-fs2.c 2011-12-06 10:44:33.000000000 +0200 ++++ pidgin-2.10.1/libpurple/media/backend-fs2.c 2012-03-10 18:21:19.000000000 +0200 +@@ -1,5 +1,5 @@ + /** +- * @file backend-fs2.c Farsight 2 backend for media API ++ * @file backend-fs2.c Farstream backend for media API + * @ingroup core + */ + +@@ -34,8 +34,9 @@ + #include "network.h" + #include "media-gst.h" + +-#include +-#include ++#include ++#include ++#include + + /** @copydoc _PurpleMediaBackendFs2Class */ + typedef struct _PurpleMediaBackendFs2Class PurpleMediaBackendFs2Class; +@@ -112,6 +113,8 @@ struct _PurpleMediaBackendFs2Stream + gchar *participant; + FsStream *stream; + ++ gboolean supports_add; ++ + GstElement *src; + GstElement *tee; + GstElement *volume; +@@ -147,6 +150,8 @@ struct _PurpleMediaBackendFs2Private + FsConference *conference; + gchar *conference_type; + ++ FsElementAddedNotifier *notifier; ++ + GHashTable *sessions; + GHashTable *participants; + +@@ -212,6 +217,11 @@ purple_media_backend_fs2_dispose(GObject + + purple_debug_info("backend-fs2", "purple_media_backend_fs2_dispose\n"); + ++ if (priv->notifier) { ++ g_object_unref(priv->notifier); ++ priv->notifier = NULL; ++ } ++ + if (priv->confbin) { + GstElement *pipeline; + +@@ -846,7 +856,7 @@ gst_handle_message_element(GstBus *bus, + priv->conference != FS_CONFERENCE(src)) + return; + +- if (gst_structure_has_name(msg->structure, "farsight-error")) { ++ if (gst_structure_has_name(msg->structure, "farstream-error")) { + FsError error_no; + gst_structure_get_enum(msg->structure, "error-no", + FS_TYPE_ERROR, (gint*)&error_no); +@@ -867,16 +877,9 @@ gst_handle_message_element(GstBus *bus, + " strict.")); + purple_media_end(priv->media, NULL, NULL); + break; +- case FS_ERROR_UNKNOWN_CNAME: +- /* +- * Unknown CName is only a problem for the +- * multicast transmitter which isn't used. +- * It is also deprecated. +- */ +- break; + default: + purple_debug_error("backend-fs2", +- "farsight-error: %i: %s\n", ++ "farstream-error: %i: %s\n", + error_no, + gst_structure_get_string( + msg->structure, "error-msg")); +@@ -885,11 +888,11 @@ gst_handle_message_element(GstBus *bus, + + if (FS_ERROR_IS_FATAL(error_no)) { + purple_media_error(priv->media, _("A non-recoverable " +- "Farsight2 error has occurred.")); ++ "Farstream error has occurred.")); + purple_media_end(priv->media, NULL, NULL); + } + } else if (gst_structure_has_name(msg->structure, +- "farsight-new-local-candidate")) { ++ "farstream-new-local-candidate")) { + const GValue *value; + FsStream *stream; + FsCandidate *local_candidate; +@@ -924,7 +927,7 @@ gst_handle_message_element(GstBus *bus, + session->id, name, candidate); + g_object_unref(candidate); + } else if (gst_structure_has_name(msg->structure, +- "farsight-local-candidates-prepared")) { ++ "farstream-local-candidates-prepared")) { + const GValue *value; + FsStream *stream; + FsParticipant *participant; +@@ -942,7 +945,7 @@ gst_handle_message_element(GstBus *bus, + g_signal_emit_by_name(self, "candidates-prepared", + session->id, name); + } else if (gst_structure_has_name(msg->structure, +- "farsight-new-active-candidate-pair")) { ++ "farstream-new-active-candidate-pair")) { + const GValue *value; + FsStream *stream; + FsCandidate *local_candidate; +@@ -976,7 +979,7 @@ gst_handle_message_element(GstBus *bus, + g_object_unref(lcandidate); + g_object_unref(rcandidate); + } else if (gst_structure_has_name(msg->structure, +- "farsight-recv-codecs-changed")) { ++ "farstream-recv-codecs-changed")) { + const GValue *value; + GList *codecs; + FsCodec *codec; +@@ -986,10 +989,10 @@ gst_handle_message_element(GstBus *bus, + codec = codecs->data; + + purple_debug_info("backend-fs2", +- "farsight-recv-codecs-changed: %s\n", ++ "farstream-recv-codecs-changed: %s\n", + codec->encoding_name); + } else if (gst_structure_has_name(msg->structure, +- "farsight-component-state-changed")) { ++ "farstream-component-state-changed")) { + const GValue *value; + FsStreamState fsstate; + guint component; +@@ -1025,11 +1028,11 @@ gst_handle_message_element(GstBus *bus, + } + + purple_debug_info("backend-fs2", +- "farsight-component-state-changed: " ++ "farstream-component-state-changed: " + "component: %u state: %s\n", + component, state); + } else if (gst_structure_has_name(msg->structure, +- "farsight-send-codec-changed")) { ++ "farstream-send-codec-changed")) { + const GValue *value; + FsCodec *codec; + gchar *codec_str; +@@ -1039,12 +1042,12 @@ gst_handle_message_element(GstBus *bus, + codec_str = fs_codec_to_string(codec); + + purple_debug_info("backend-fs2", +- "farsight-send-codec-changed: codec: %s\n", ++ "farstream-send-codec-changed: codec: %s\n", + codec_str); + + g_free(codec_str); + } else if (gst_structure_has_name(msg->structure, +- "farsight-codecs-changed")) { ++ "farstream-codecs-changed")) { + const GValue *value; + FsSession *fssession; + GList *sessions; +@@ -1220,8 +1223,12 @@ stream_info_cb(PurpleMedia *media, Purpl + purple_media_is_initiator(media, sid, name)) + return; + +- fs_stream_set_remote_candidates(stream->stream, +- stream->remote_candidates, &err); ++ if (stream->supports_add) ++ fs_stream_add_remote_candidates(stream->stream, ++ stream->remote_candidates, &err); ++ else ++ fs_stream_force_remote_candidates(stream->stream, ++ stream->remote_candidates, &err); + + if (err == NULL) + return; +@@ -1301,6 +1308,7 @@ init_conference(PurpleMediaBackendFs2 *s + GstElement *pipeline; + GstBus *bus; + gchar *name; ++ GKeyFile *default_props; + + priv->conference = FS_CONFERENCE( + gst_element_factory_make(priv->conference_type, NULL)); +@@ -1343,6 +1351,14 @@ init_conference(PurpleMediaBackendFs2 *s + return FALSE; + } + ++ default_props = fs_utils_get_default_element_properties(GST_ELEMENT(priv->conference)); ++ if (default_props != NULL) { ++ priv->notifier = fs_element_added_notifier_new(); ++ fs_element_added_notifier_add(priv->notifier, ++ GST_BIN(priv->confbin)); ++ fs_element_added_notifier_set_properties_from_keyfile(priv->notifier, default_props); ++ } ++ + g_signal_connect(G_OBJECT(bus), "message", + G_CALLBACK(gst_bus_cb), self); + gst_object_unref(bus); +@@ -1559,7 +1575,7 @@ create_session(PurpleMediaBackendFs2 *se + * receiving the src-pad-added signal. + * Only works for non-multicast FsRtpSessions. + */ +- if (is_nice || !strcmp(transmitter, "rawudp")) ++ if (!!strcmp(transmitter, "multicast")) + g_object_set(G_OBJECT(session->session), + "no-rtcp-timeout", 0, NULL); + +@@ -1612,7 +1628,7 @@ create_participant(PurpleMediaBackendFs2 + GError *err = NULL; + + participant = fs_conference_new_participant( +- priv->conference, name, &err); ++ priv->conference, &err); + + if (err) { + purple_debug_error("backend-fs2", +@@ -1622,6 +1638,12 @@ create_participant(PurpleMediaBackendFs2 + return FALSE; + } + ++ if (g_object_class_find_property(G_OBJECT_GET_CLASS(participant), ++ "cname")) { ++ g_object_set(participant, "cname", name, NULL); ++ } ++ ++ + if (!priv->participants) { + purple_debug_info("backend-fs2", + "Creating hash table for participants\n"); +@@ -1786,6 +1808,40 @@ create_stream(PurpleMediaBackendFs2 *sel + } + } + ++ ++ session = get_session(self, sess_id); ++ ++ if (session == NULL) { ++ purple_debug_error("backend-fs2", ++ "Couldn't find session to create stream.\n"); ++ return FALSE; ++ } ++ ++ participant = get_participant(self, who); ++ ++ if (participant == NULL) { ++ purple_debug_error("backend-fs2", "Couldn't find " ++ "participant to create stream.\n"); ++ return FALSE; ++ } ++ ++ fsstream = fs_session_new_stream(session->session, participant, ++ initiator == TRUE ? type_direction : ++ (type_direction & FS_DIRECTION_RECV), &err); ++ ++ if (fsstream == NULL) { ++ if (err) { ++ purple_debug_error("backend-fs2", ++ "Error creating stream: %s\n", ++ err && err->message ? ++ err->message : "NULL"); ++ g_error_free(err); ++ } else ++ purple_debug_error("backend-fs2", ++ "Error creating stream\n"); ++ return FALSE; ++ } ++ + memcpy(_params, params, sizeof(GParameter) * num_params); + + /* set the controlling mode parameter */ +@@ -1840,45 +1896,22 @@ create_stream(PurpleMediaBackendFs2 *sel + _num_params++; + } + +- session = get_session(self, sess_id); + +- if (session == NULL) { +- purple_debug_error("backend-fs2", +- "Couldn't find session to create stream.\n"); +- return FALSE; +- } +- +- participant = get_participant(self, who); +- +- if (participant == NULL) { +- purple_debug_error("backend-fs2", "Couldn't find " +- "participant to create stream.\n"); +- return FALSE; ++ if(!fs_stream_set_transmitter(fsstream, transmitter, ++ _params, _num_params, &err)) { ++ purple_debug_error("backend-fs2", "Could not set transmitter %s: %s.\n", transmitter, err->message); ++ g_clear_error(&err); ++ g_free(_params); ++ return FALSE; + } +- +- fsstream = fs_session_new_stream(session->session, participant, +- initiator == TRUE ? type_direction : +- (type_direction & FS_DIRECTION_RECV), transmitter, +- _num_params, _params, &err); + g_free(_params); + +- if (fsstream == NULL) { +- if (err) { +- purple_debug_error("backend-fs2", +- "Error creating stream: %s\n", +- err && err->message ? +- err->message : "NULL"); +- g_error_free(err); +- } else +- purple_debug_error("backend-fs2", +- "Error creating stream\n"); +- return FALSE; +- } + + stream = g_new0(PurpleMediaBackendFs2Stream, 1); + stream->participant = g_strdup(who); + stream->session = session; + stream->stream = fsstream; ++ stream->supports_add = !strcmp(transmitter, "nice"); + + priv->streams = g_list_append(priv->streams, stream); + +@@ -1991,7 +2024,11 @@ purple_media_backend_fs2_add_remote_cand + if (purple_media_is_initiator(priv->media, sess_id, participant) || + purple_media_accepted( + priv->media, sess_id, participant)) { +- fs_stream_set_remote_candidates(stream->stream, ++ if (stream->supports_add) ++ fs_stream_add_remote_candidates(stream->stream, ++ stream->remote_candidates, &err); ++ else ++ fs_stream_force_remote_candidates(stream->stream, + stream->remote_candidates, &err); + + if (err) { +diff -upr pidgin-2.10.1.orig/libpurple/media.c pidgin-2.10.1/libpurple/media.c +--- pidgin-2.10.1.orig/libpurple/media.c 2011-12-06 10:44:33.000000000 +0200 ++++ pidgin-2.10.1/libpurple/media.c 2012-03-10 18:21:19.000000000 +0200 +@@ -1067,7 +1067,6 @@ purple_media_add_stream(PurpleMedia *med + { + #ifdef USE_VV + PurpleMediaSession *session; +- PurpleMediaStream *stream = NULL; + + g_return_val_if_fail(PURPLE_IS_MEDIA(media), FALSE); + +@@ -1103,7 +1102,7 @@ purple_media_add_stream(PurpleMedia *med + } + + if (purple_media_get_stream(media, sess_id, who) == NULL) { +- stream = purple_media_insert_stream(session, who, initiator); ++ purple_media_insert_stream(session, who, initiator); + + g_signal_emit(media, purple_media_signals[STATE_CHANGED], + 0, PURPLE_MEDIA_STATE_NEW, +diff -upr pidgin-2.10.1.orig/libpurple/mediamanager.c pidgin-2.10.1/libpurple/mediamanager.c +--- pidgin-2.10.1.orig/libpurple/mediamanager.c 2011-12-06 10:44:33.000000000 +0200 ++++ pidgin-2.10.1/libpurple/mediamanager.c 2012-03-10 18:27:05.000000000 +0200 +@@ -39,7 +39,7 @@ + #ifdef USE_VV + #include + +-#include ++#include + #include + + /** @copydoc _PurpleMediaManagerPrivate */ diff --git a/testing/pygobject/PKGBUILD b/testing/pygobject/PKGBUILD new file mode 100644 index 000000000..d639650f3 --- /dev/null +++ b/testing/pygobject/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 155252 2012-04-01 11:36:49Z heftig $ +# Maintainer: Ionut Biru + +pkgbase=pygobject +pkgname=(python-gobject python2-gobject pygobject-devel) +pkgver=3.2.0 +pkgrel=1 +arch=('i686' 'x86_64') +url="https://live.gnome.org/PyGObject" +license=('LGPL') +makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +options=('!libtool') +sha256sums=('1a2140c4c4ce0c1a5d7abe74eeb7a7040f426cb17943c3ae7e57695b355151c3') + +build() { + cp -a "$pkgbase-$pkgver" python2-build + mkdir devel + + ( + cd python2-build + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr + make + ) + + ( + cd "$pkgbase-$pkgver" + ./configure --prefix=/usr + make + ) +} + +package_python-gobject() { + pkgdesc="Python 3 bindings for GObject" + depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver") + + cd "$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + rm -r "$pkgdir"/usr/{include,lib/pkgconfig} +} + +package_python2-gobject() { + pkgdesc="Python 2 bindings for GObject" + depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver") + + cd "python2-build" + make DESTDIR="$pkgdir" install + mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel" +} + +package_pygobject-devel() { + pkgdesc="Development files for the pygobject bindings" + cd "devel" + mkdir -p "$pkgdir"/usr/{include,lib} + mv include "$pkgdir/usr/" + mv pkgconfig "$pkgdir/usr/lib/" +} diff --git a/testing/rhythmbox/PKGBUILD b/testing/rhythmbox/PKGBUILD new file mode 100644 index 000000000..f0c7de120 --- /dev/null +++ b/testing/rhythmbox/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 155254 2012-04-01 11:36:54Z heftig $ +# Maintainer: Jan de Groot +# Contributor: Giovanni Scafora + +pkgname=rhythmbox +pkgver=2.96 +pkgrel=1 +pkgdesc="An iTunes-like music playback and management application" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.rhythmbox.org" +depends=('clutter' 'clutter-gtk' 'clutter-gst' 'dconf' 'desktop-file-utils' 'grilo' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib' 'libdmapsharing' 'libgpod' 'libmtp' 'libmusicbrainz3' + 'libnotify' 'libpeas' 'libwebkit3' 'lirc-utils' 'media-player-info' 'mx' 'python2-gobject' 'python2-mako' 'totem-plparser') +makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection') +optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' + 'gstreamer0.10-bad-plugins: Extra media codecs' + 'gstreamer0.10-ffmpeg: Extra media codecs' + 'brasero: cd burning') +options=('!libtool' '!emptydirs') +install=rhythmbox.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) +sha256sums=('3f93c74b2f7f8d7e1002e288db9abf8f182684277dec0a106d5e38415084b2b6') + +build() { + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/rhythmbox \ + --localstatedir=/var --disable-static \ + --enable-daap --enable-python \ + --with-mdns=avahi --disable-scrollkeeper + make +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} diff --git a/testing/rhythmbox/rhythmbox.install b/testing/rhythmbox/rhythmbox.install new file mode 100644 index 000000000..e02ee2c16 --- /dev/null +++ b/testing/rhythmbox/rhythmbox.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/seahorse/PKGBUILD b/testing/seahorse/PKGBUILD new file mode 100644 index 000000000..f11d876eb --- /dev/null +++ b/testing/seahorse/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 155256 2012-04-01 11:36:57Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot +# Contributor: Michel Brabants + +pkgname=seahorse +pkgver=3.4.0 +pkgrel=1 +pkgdesc="GNOME application for managing PGP keys." +arch=(i686 x86_64) +license=('GPL') +url="http://projects.gnome.org/seahorse/" +depends=('gtk3' 'gcr' 'libgnome-keyring' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf') +makedepends=('libldap' 'intltool' 'gnome-doc-utils' 'gobject-introspection' 'openssh' 'libsm') +optdepends=('openssh: SSH support') +provides=('x11-ssh-askpass') +options=('!libtool' '!emptydirs') +groups=('gnome-extra') +install=seahorse.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + seahorse-ssh-askpass.sh) +sha256sums=('6bb7a7952c3d39a6023ddb493d9e31c4ed99ef3da1062d5dfd4b47d1d4ca2cc9' + '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --enable-ldap --enable-hkp \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm755 "$srcdir/seahorse-ssh-askpass.sh" \ + "$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh" +} diff --git a/testing/seahorse/seahorse-ssh-askpass.sh b/testing/seahorse/seahorse-ssh-askpass.sh new file mode 100644 index 000000000..04f79d8f2 --- /dev/null +++ b/testing/seahorse/seahorse-ssh-askpass.sh @@ -0,0 +1,3 @@ +if [ -z "$SSH_ASKPASS" ] && [ -n "$DISPLAY" ]; then + export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass +fi diff --git a/testing/seahorse/seahorse.install b/testing/seahorse/seahorse.install new file mode 100644 index 000000000..1571179ca --- /dev/null +++ b/testing/seahorse/seahorse.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/sound-juicer/PKGBUILD b/testing/sound-juicer/PKGBUILD new file mode 100644 index 000000000..ecd560624 --- /dev/null +++ b/testing/sound-juicer/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 155258 2012-04-01 11:37:00Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot +# Contributor: Ben + +pkgname=sound-juicer +pkgver=3.4.0 +pkgrel=1 +pkgdesc="A cd ripper application" +arch=(i686 x86_64) +license=('GPL') +depends=('libmusicbrainz4' 'libdiscid' 'gtk3' 'gstreamer0.10-base-plugins' + 'gstreamer0.10-good-plugins' 'brasero' 'hicolor-icon-theme') +makedepends=('intltool' 'gnome-doc-utils') +options=(!emptydirs) +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +groups=('gnome-extra') +install=sound-juicer.install +sha256sums=('49805cc73617e745ee09b62fec46979387e5713d39e5f75320b91ee8f0c44f12') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-scrollkeeper + make +} + +package() { + cd "${srcdir}/${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 sound-juicer ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/testing/sound-juicer/sound-juicer.install b/testing/sound-juicer/sound-juicer.install new file mode 100644 index 000000000..5286a0055 --- /dev/null +++ b/testing/sound-juicer/sound-juicer.install @@ -0,0 +1,24 @@ +pkgname=sound-juicer + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} diff --git a/testing/sushi/PKGBUILD b/testing/sushi/PKGBUILD new file mode 100644 index 000000000..c6074ce23 --- /dev/null +++ b/testing/sushi/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 155260 2012-04-01 11:37:04Z heftig $ +# Maintainer: Ionut Biru + +pkgname=sushi +pkgver=0.4.0 +pkgrel=1 +pkgdesc="A quick previewer for Nautilus" +arch=(i686 x86_64) +url="http://www.gnome.org" +license=('GPL2') +groups=(gnome-extra) +depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz3' 'libwebkit3' 'gtksourceview3' 'evince') +makedepends=('intltool' 'gobject-introspection') +options=(!libtool) +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('75a72d442674fa63d817f70bdb2b9559752509f9bd8a2f6ff854f800eab1e9e7') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --libexecdir=/usr/lib/sushi + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/system-config-printer/PKGBUILD b/testing/system-config-printer/PKGBUILD new file mode 100644 index 000000000..d7bd87da8 --- /dev/null +++ b/testing/system-config-printer/PKGBUILD @@ -0,0 +1,104 @@ +# $Id: PKGBUILD 155329 2012-04-01 19:53:09Z tomegun $ +# Maintainer: Andrea Scarpino + +pkgbase=system-config-printer +pkgname=('system-config-printer-common' + 'system-config-printer-gnome') +pkgver=1.3.9 +pkgrel=2 +pkgdesc="A CUPS printer configuration tool and status applet" +url="http://cyberelk.net/tim/software/system-config-printer/" +arch=('i686' 'x86_64') +license=('GPL') +makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils') +source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig}) +md5sums=('df424f127eede63965608e5ec5e27519' + 'd105b7f7725c1ec538b6e6adb10667f3') + +build() { + cd "${srcdir}"/${pkgbase}-${pkgver} + + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find . -name '*.py') + sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer + + ./configure --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc \ + --with-udev-rules + + make +} + +package_system-config-printer-common() { + pkgdesc='Pygtk CUPS Configuration' + depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python-pycurl' 'libusb-compat') + optdepends=('system-config-printer-gnome: for the GTK frontend' + 'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings') + replaces=('system-config-printer') + provides=("system-config-printer=${pkgver}") + conflicts=('system-config-printer') + + cd "${srcdir}"/${pkgbase}-${pkgver} + install -d "${pkgdir}"/usr/share/${pkgbase} + install -m644 config.py \ + debug.py \ + installpackage.py \ + monitor.py \ + PhysicalDevice.py \ + ppdippstr.py \ + probe_printer.py \ + SearchCriterion.py \ + smburi.py \ + statereason.py \ + "${pkgdir}"/usr/share/${pkgbase}/ + + install -m755 pysmb.py \ + "${pkgdir}"/usr/share/${pkgbase}/ + + install -d "${pkgdir}"/etc/dbus-1/system.d/ + install -m644 dbus/com.redhat.NewPrinterNotification.conf \ + dbus/com.redhat.PrinterDriversInstaller.conf \ + "${pkgdir}"/etc/dbus-1/system.d/ + install -d "${pkgdir}"/etc/cupshelpers/ + install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/ + + install -d "${pkgdir}"/usr/lib/udev/rules.d + install -m755 udev/{udev-add-printer,udev-configure-printer} \ + "${pkgdir}"/usr/lib/udev/ + install -m644 udev/70-printers.rules \ + "${pkgdir}"/usr/lib/udev/rules.d + + for file in build/lib/cupshelpers/*.py; do + install -Dm644 $file \ + "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file) + done +} + +package_system-config-printer-gnome() { + pkgdesc='A CUPS printer configuration tool and status applet - GTK frontend' + depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify') + optdependence=('gnome-keyring: password management') + + cd "${srcdir}"/${pkgbase}-${pkgver} + make DESTDIR="${pkgdir}" install + + # files provided by system-config-printer-common + cd "${pkgdir}"/usr/share/${pkgbase} + rm config.py \ + debug.py \ + installpackage.py \ + monitor.py \ + PhysicalDevice.py \ + ppdippstr.py \ + probe_printer.py \ + SearchCriterion.py \ + smburi.py \ + statereason.py \ + pysmb.py + rm -r "${pkgdir}"/etc/dbus-1/ + rm -r "${pkgdir}"/etc/cupshelpers/ + rm -r "${pkgdir}"/etc/udev/ + rm -r "${pkgdir}"/usr/lib/ +} diff --git a/testing/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch b/testing/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch new file mode 100644 index 000000000..fa133ca3c --- /dev/null +++ b/testing/systemd/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch @@ -0,0 +1,156 @@ +From 75c8e3cffd7da8eede614cf61384957af2c82a29 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Thu, 22 Mar 2012 02:06:40 +0100 +Subject: [PATCH] logind: close FIFO before ending sessions cleanly + +For clean session endings ask logind explicitly to get rid of the FIFO +before closing it so that the FIFO logic doesn't result in su/sudo to be +terminated immediately. +--- + src/login/logind-dbus.c | 30 ++++++++++++++++++++ + src/login/pam-module.c | 71 +++++++++++++++++++++++++++++++++++++++++++++-- + 2 files changed, 98 insertions(+), 3 deletions(-) + +diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c +index d8f4d89..ea6b89f 100644 +--- a/src/login/logind-dbus.c ++++ b/src/login/logind-dbus.c +@@ -80,6 +80,9 @@ + " \n" \ + " \n" \ + " \n" \ ++ " \n" \ ++ " \n" \ ++ " \n" \ + " \n" \ + " \n" \ + " \n" \ +@@ -1075,6 +1078,33 @@ static DBusHandlerResult manager_message_handler( + if (r < 0) + return bus_send_error_reply(connection, message, &error, r); + ++ } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ReleaseSession")) { ++ const char *name; ++ Session *session; ++ ++ if (!dbus_message_get_args( ++ message, ++ &error, ++ DBUS_TYPE_STRING, &name, ++ DBUS_TYPE_INVALID)) ++ return bus_send_error_reply(connection, message, &error, -EINVAL); ++ ++ session = hashmap_get(m->sessions, name); ++ if (!session) ++ return bus_send_error_reply(connection, message, &error, -ENOENT); ++ ++ /* We use the FIFO to detect stray sessions where the ++ process invoking PAM dies abnormally. We need to make ++ sure that that process is not killed if at the clean ++ end of the session it closes the FIFO. Hence, with ++ this call explicitly turn off the FIFO logic, so that ++ the PAM code can finish clean up on its own */ ++ session_remove_fifo(session); ++ ++ reply = dbus_message_new_method_return(message); ++ if (!reply) ++ goto oom; ++ + } else if (dbus_message_is_method_call(message, "org.freedesktop.login1.Manager", "ActivateSession")) { + const char *name; + Session *session; +diff --git a/src/login/pam-module.c b/src/login/pam-module.c +index 8544413..4106d2b 100644 +--- a/src/login/pam-module.c ++++ b/src/login/pam-module.c +@@ -414,7 +414,6 @@ _public_ PAM_EXTERN int pam_sm_open_session( + "/org/freedesktop/login1", + "org.freedesktop.login1.Manager", + "CreateSession"); +- + if (!m) { + pam_syslog(handle, LOG_ERR, "Could not allocate create session message."); + r = PAM_BUF_ERR; +@@ -620,11 +619,77 @@ _public_ PAM_EXTERN int pam_sm_close_session( + int argc, const char **argv) { + + const void *p = NULL; ++ const char *id; ++ DBusConnection *bus = NULL; ++ DBusMessage *m = NULL, *reply = NULL; ++ DBusError error; ++ int r; + +- pam_get_data(handle, "systemd.session-fd", &p); ++ assert(handle); ++ ++ dbus_error_init(&error); ++ ++ id = pam_getenv(handle, "XDG_SESSION_ID"); ++ if (id) { ++ ++ /* Before we go and close the FIFO we need to tell ++ * logind that this is a clean session shutdown, so ++ * that it doesn't just go and slaughter us ++ * immediately after closing the fd */ ++ ++ bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error); ++ if (!bus) { ++ pam_syslog(handle, LOG_ERR, "Failed to connect to system bus: %s", bus_error_message(&error)); ++ r = PAM_SESSION_ERR; ++ goto finish; ++ } ++ ++ m = dbus_message_new_method_call( ++ "org.freedesktop.login1", ++ "/org/freedesktop/login1", ++ "org.freedesktop.login1.Manager", ++ "ReleaseSession"); ++ if (!m) { ++ pam_syslog(handle, LOG_ERR, "Could not allocate release session message."); ++ r = PAM_BUF_ERR; ++ goto finish; ++ } ++ ++ if (!dbus_message_append_args(m, ++ DBUS_TYPE_STRING, &id, ++ DBUS_TYPE_INVALID)) { ++ pam_syslog(handle, LOG_ERR, "Could not attach parameters to message."); ++ r = PAM_BUF_ERR; ++ goto finish; ++ } + ++ reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error); ++ if (!reply) { ++ pam_syslog(handle, LOG_ERR, "Failed to release session: %s", bus_error_message(&error)); ++ r = PAM_SESSION_ERR; ++ goto finish; ++ } ++ } ++ ++ r = PAM_SUCCESS; ++ ++finish: ++ pam_get_data(handle, "systemd.session-fd", &p); + if (p) + close_nointr(PTR_TO_INT(p) - 1); + +- return PAM_SUCCESS; ++ dbus_error_free(&error); ++ ++ if (bus) { ++ dbus_connection_close(bus); ++ dbus_connection_unref(bus); ++ } ++ ++ if (m) ++ dbus_message_unref(m); ++ ++ if (reply) ++ dbus_message_unref(reply); ++ ++ return r; + } +-- +1.7.9.5 + diff --git a/testing/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch b/testing/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch new file mode 100644 index 000000000..7ac9251b3 --- /dev/null +++ b/testing/systemd/0001-util-never-follow-symlinks-in-rm_rf_children.patch @@ -0,0 +1,32 @@ +From 5ebff5337594d690b322078c512eb222d34aaa82 Mon Sep 17 00:00:00 2001 +From: Michal Schmidt +Date: Fri, 2 Mar 2012 10:39:10 +0100 +Subject: [PATCH] util: never follow symlinks in rm_rf_children() + +The function checks if the entry is a directory before recursing, but +there is a window between the check and the open, during which the +directory could be replaced with a symlink. + +CVE-2012-1174 +https://bugzilla.redhat.com/show_bug.cgi?id=803358 +--- + src/util.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/util.c b/src/util.c +index 20cbc2b..dfc1dc6 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -3593,7 +3593,8 @@ static int rm_rf_children(int fd, bool only_dirs, bool honour_sticky) { + if (is_dir) { + int subdir_fd; + +- if ((subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC)) < 0) { ++ subdir_fd = openat(fd, de->d_name, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW); ++ if (subdir_fd < 0) { + if (ret == 0 && errno != ENOENT) + ret = -errno; + continue; +-- +1.7.9.4 + diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD new file mode 100644 index 000000000..2be6d6e31 --- /dev/null +++ b/testing/systemd/PKGBUILD @@ -0,0 +1,118 @@ +# $Id: PKGBUILD 155344 2012-04-01 23:17:08Z dreisner $ +# Maintainer: Dave Reisner + +pkgbase=systemd +pkgname=('systemd' 'libsystemd') +pkgver=44 +pkgrel=4 +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/systemd" +license=('GPL2') +makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool' + 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz') +options=('!libtool') +source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" + "os-release" + 0001-util-never-follow-symlinks-in-rm_rf_children.patch + 0001-logind-close-FIFO-before-ending-sessions-cleanly.patch) +md5sums=('11f44ff74c87850064e4351518bcff17' + '752636def0db3c03f121f8b4f44a63cd' + 'b5863d6d4b47e2b5bda8eb57bde0d327' + 'd37833358ef6c23fad622ea4a0941d1f') + +build() { + cd "$pkgname-$pkgver" + + # https://bugzilla.redhat.com/show_bug.cgi?id=803358 + patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch" + + # https://bugs.archlinux.org/task/28386 + patch -Np1 <"$srcdir/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch" + + ./configure --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --with-pamlibdir=/lib/security \ + --localstatedir=/var \ + --with-distro=arch \ + --enable-split-usr + + make +} + +package_systemd() { + pkgdesc="system and service manager" + depends=('acl' 'dbus' 'dbus-core' 'libsystemd' 'kbd' 'kmod' 'libcap' 'pam' 'util-linux' 'udev' 'xz') + optdepends=('cryptsetup: required for encrypted block devices' + 'dbus-python: systemd-analyze' + 'initscripts: legacy support for hostname and vconsole setup' + 'initscripts-systemd: native boot and initialization scripts' + 'python2-cairo: systemd-analyze' + 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' + 'systemd-sysvcompat: symlink package to provide sysvinit binaries') + backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf + etc/dbus-1/system.d/org.freedesktop.hostname1.conf + etc/dbus-1/system.d/org.freedesktop.login1.conf + etc/dbus-1/system.d/org.freedesktop.locale1.conf + etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/systemd/system.conf + etc/systemd/user.conf + etc/systemd/systemd-logind.conf + etc/systemd/systemd-journald.conf) + install="$pkgname.install" + + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" + + printf "d /run/console 755 root root\n" >"$pkgdir/usr/lib/tmpfiles.d/console.conf" + chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf" + + # symlink to /bin/systemd for compat and sanity + install -dm755 "$pkgdir/bin" "$pkgdir/lib/systemd" + ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" + ln -s ../../usr/lib/systemd/systemd "$pkgdir/lib/systemd/systemd" + + # use python2 for systemd-analyze + sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" + + # didn't build this... + rm -f "$pkgdir/usr/share/man/man1/systemadm.1" + + # fix .so links in manpage stubs + find "$pkgdir/usr/share/man" -type f -name '*.[[:digit:]]' \ + -exec sed -i '1s|^\.so \(.*\)\.\([[:digit:]]\+\)|.so man\2/\1.\2|' {} + + + # rename man pages to avoid conflicts with sysvinit and initscripts + manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 + man5/{hostname,{vconsole,locale}.conf}.5) + cd "$pkgdir/usr/share/man" + for manpage in "${manpages[@]}"; do + IFS='/' read section page <<< "$manpage" + mv "$manpage" "$section/systemd.$page" + done + + # move bash-completion and symlink for loginctl + install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \ + "$pkgdir/usr/share/bash-completion/completions/systemctl" + ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl" + rm -rf "$pkgdir/etc/bash_completion.d" + + ### split off libsystemd (libs, includes, pkgconfig, man3) + install -dm755 "$srcdir"/libsystemd/usr/{include,lib/pkgconfig} + + cd "$srcdir"/libsystemd + mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib + mv "$pkgdir/usr/include/systemd" usr/include + mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig +} + +package_libsystemd() { + pkgdesc="systemd client libraries" + depends=('libcap' 'xz') + + mv "$srcdir/libsystemd"/* "$pkgdir" +} + +# vim: ft=sh syn=sh et diff --git a/testing/systemd/cpp-compat.patch b/testing/systemd/cpp-compat.patch new file mode 100644 index 000000000..346c353bc --- /dev/null +++ b/testing/systemd/cpp-compat.patch @@ -0,0 +1,19 @@ +commit e09a9a35a1fdb4e849e63bdaf47d936c272b5e82 +Author: Lennart Poettering +Date: 2012-03-05 15:16:10 +0100 + + sd-login: c++ compatibility + +diff --git a/src/systemd/sd-login.h b/src/systemd/sd-login.h +index 2f3c90c..6e99cfc 100644 +--- a/src/systemd/sd-login.h ++++ b/src/systemd/sd-login.h +@@ -94,7 +94,7 @@ int sd_session_get_service(const char *session, char **service); + int sd_session_get_type(const char *session, char **type); + + /* Determine the class of this session, i.e. one of "user", "greeter" or "lock-screen". */ +-int sd_session_get_class(const char *session, char **class); ++int sd_session_get_class(const char *session, char **clazz); + + /* Determine the X11 display of this session. */ + int sd_session_get_display(const char *session, char **display); diff --git a/testing/systemd/os-release b/testing/systemd/os-release new file mode 100644 index 000000000..5e24a6031 --- /dev/null +++ b/testing/systemd/os-release @@ -0,0 +1,5 @@ +NAME="Arch Linux" +ID=arch +PRETTY_NAME="Arch Linux" +ANSI_COLOR="1;36" + diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install new file mode 100644 index 000000000..822108c0f --- /dev/null +++ b/testing/systemd/systemd.install @@ -0,0 +1,54 @@ +#!/bin/sh + +checkgroups() { + if ! getent group lock >/dev/null; then + groupadd -g 54 lock + fi +} + +sd_booted() { + [ -e sys/fs/cgroup/systemd ] +} + +post_install() { + checkgroups + + if [ ! -f etc/machine-id ]; then + systemd-machine-id-setup + fi + + echo "systemd has been installed to /bin/systemd. Please ensure you append" + echo "init=/bin/systemd to your kernel command line in your bootloader." +} + +post_upgrade() { + checkgroups + + if [ ! -f etc/machine-id ]; then + systemd-machine-id-setup + fi + + if sd_booted; then + systemctl daemon-reload + systemctl daemon-reexec + fi + + newpkgver=${1%-*} + oldpkgver=${2%-*} + + # catch v31 need for restarting systemd-logind.service + if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then + # but only if systemd is running + if sd_booted; then + systemctl try-restart systemd-logind.service + fi + fi +} + +post_remove() { + if getent group lock >/dev/null; then + groupdel lock + fi +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/telepathy-farstream/PKGBUILD b/testing/telepathy-farstream/PKGBUILD new file mode 100644 index 000000000..7e4b13e18 --- /dev/null +++ b/testing/telepathy-farstream/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 155262 2012-04-01 11:37:07Z heftig $ +# Maintainer: Ionut Biru + +pkgname=telepathy-farstream +pkgver=0.2.3 +pkgrel=1 +pkgdesc="A telepathy-backend to use stream engine." +arch=(i686 x86_64) +url="http://telepathy.freedesktop.org" +license=('LGPL2.1') +depends=('telepathy-glib' 'farstream') +makedepends=('libxslt' 'gstreamer0.10-python' 'python2-gobject2') +conflicts=('telepathy-farsight') +replaces=('telepathy-farsight') +options=('!libtool') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('9a5de84f1f4bb4505cc982b4a7fea539') + +build() { + cd "$pkgname-$pkgver" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/telepathy \ + --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/telepathy-gabble/PKGBUILD b/testing/telepathy-gabble/PKGBUILD new file mode 100644 index 000000000..74a042e2b --- /dev/null +++ b/testing/telepathy-gabble/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 155264 2012-04-01 11:37:09Z heftig $ +# Maintainer : Ionut Biru +# Contributor: Daniel Balieiro +# Contributor: Rodrigo L. M. Flores +pkgname=telepathy-gabble +pkgver=0.15.5 +pkgrel=1 +pkgdesc="A Jabber/XMPP connection manager for Telepathy" +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org" +groups=('telepathy') +license=('LGPL2.1') +depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite3') +makedepends=('libxslt' 'python2') +options=('!libtool' '!emptydirs') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +install=telepathy-gabble.install +md5sums=('89b21ac2f29d632efd1cc50e0c2cd933') + +build() { + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy --with-tls=openssl + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/telepathy-gabble-xmpp-console" +} diff --git a/testing/telepathy-gabble/telepathy-gabble.install b/testing/telepathy-gabble/telepathy-gabble.install new file mode 100644 index 000000000..87d7838b8 --- /dev/null +++ b/testing/telepathy-gabble/telepathy-gabble.install @@ -0,0 +1,13 @@ +post_install() { + killall -HUP dbus-daemon 2>&1 +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/telepathy-glib/PKGBUILD b/testing/telepathy-glib/PKGBUILD new file mode 100644 index 000000000..56314441e --- /dev/null +++ b/testing/telepathy-glib/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 155266 2012-04-01 11:37:12Z heftig $ +# Maintainer: Ionut Biru +# Contributor: Kessia 'even' Pinheiro + +pkgname=telepathy-glib +pkgver=0.17.7 +pkgrel=1 +pkgdesc="GLib bindings for the Telepathy D-Bus protocol" +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org" +license=('LGPL2.1') +options=('!libtool' '!emptydirs') +depends=('dbus-glib') +makedepends=('libxslt' 'vala' 'gobject-introspection') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('92e776d375cfe0ef6af4aff600a5150e') + +build() { + cd "$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy \ + --enable-vala-bindings \ + --enable-static=no + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/telepathy-haze/PKGBUILD b/testing/telepathy-haze/PKGBUILD new file mode 100644 index 000000000..8c78a8b84 --- /dev/null +++ b/testing/telepathy-haze/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 155268 2012-04-01 11:37:15Z heftig $ +# Maintainer: Ionut Biru +# Contributor: Timm Preetz +pkgname=telepathy-haze +pkgver=0.5.0 +pkgrel=2 +pkgdesc="A telepathy-backend to use libpurple (Pidgin) protocols." +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org" +license=('GPL') +depends=('telepathy-glib' 'libpurple') +makedepends=('libxslt') +replaces=('telepathy-butterfly') +install=telepathy-haze.install +groups=('telepathy') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('4378726d61e1e5df789a05760a94d172') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --libexecdir=/usr/lib/telepathy + make +} + +package(){ + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/telepathy-haze/telepathy-haze.install b/testing/telepathy-haze/telepathy-haze.install new file mode 100644 index 000000000..87d7838b8 --- /dev/null +++ b/testing/telepathy-haze/telepathy-haze.install @@ -0,0 +1,13 @@ +post_install() { + killall -HUP dbus-daemon 2>&1 +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/telepathy-mission-control/PKGBUILD b/testing/telepathy-mission-control/PKGBUILD new file mode 100644 index 000000000..b3670275b --- /dev/null +++ b/testing/telepathy-mission-control/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 155270 2012-04-01 11:37:18Z heftig $ +# Maintainer: Ionut Biru +# Contributor: Ju Liu +# Contributor: Bjorn Lindeijer +# Contributor: Andreas Zwinkau + +pkgname=telepathy-mission-control +pkgver=5.11.0 +pkgrel=1 +pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org/wiki/Mission Control" +license=('LGPL2.1') +depends=('telepathy-glib' 'libgnome-keyring' 'dconf') +makedepends=('libxslt' 'python2') +install=telepathy-mission-control.install +options=('!libtool') +source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('f7503d52cb432e03ba7b4ad5bb6165c6') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --libexecdir=/usr/lib/telepathy \ + --enable-gnome-keyring \ + --disable-schemas-compile + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/telepathy-mission-control/telepathy-mission-control.install b/testing/telepathy-mission-control/telepathy-mission-control.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/testing/telepathy-mission-control/telepathy-mission-control.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/telepathy-qt4/PKGBUILD b/testing/telepathy-qt4/PKGBUILD new file mode 100644 index 000000000..ef7f38428 --- /dev/null +++ b/testing/telepathy-qt4/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 155311 2012-04-01 18:00:59Z ibiru $ +# Maintainer: Ionut Biru +# Contributor: Andrea Scarpino + +pkgname=telepathy-qt4 +pkgver=0.9.1 +pkgrel=1 +pkgdesc="A library for Qt-based Telepathy clients" +arch=('i686' 'x86_64') +url="http://telepathy.freedesktop.org/wiki/" +license=('LGPL') +options=('!libtool') +depends=('qt' 'telepathy-farstream') +makedepends=('libxslt' 'python2' 'cmake' 'doxygen') +source=("http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-$pkgver.tar.gz" + gcc47.patch) +md5sums=('e0e6c1a987bbeae44c778344a2cc9d80' + '32aa8eb06c76cb03af5ced27a674ebfb') + +build() { + cd "$srcdir" + patch -Np0 -i gcc47.patch + mkdir build + cd build + cmake ../telepathy-qt-$pkgver \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir"/build + make DESTDIR="$pkgdir" install +} diff --git a/testing/telepathy-qt4/gcc47.patch b/testing/telepathy-qt4/gcc47.patch new file mode 100644 index 000000000..ac6ae67fb --- /dev/null +++ b/testing/telepathy-qt4/gcc47.patch @@ -0,0 +1,36 @@ +diff -Nur telepathy-qt-0.9.1.orig/TelepathyQt/client-registrar.cpp telepathy-qt-0.9.1/TelepathyQt/client-registrar.cpp +--- telepathy-qt-0.9.1.orig/TelepathyQt/client-registrar.cpp 2012-04-01 17:44:00.013466055 +0000 ++++ telepathy-qt-0.9.1/TelepathyQt/client-registrar.cpp 2012-04-01 17:51:00.233486476 +0000 +@@ -39,6 +39,8 @@ + #include + #include + #include ++ ++#include + + namespace Tp + { +diff -Nur telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-client.cpp telepathy-qt-0.9.1/TelepathyQt/stream-tube-client.cpp +--- telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-client.cpp 2012-04-01 17:44:00.006799442 +0000 ++++ telepathy-qt-0.9.1/TelepathyQt/stream-tube-client.cpp 2012-04-01 17:51:00.233486476 +0000 +@@ -38,6 +38,8 @@ + #include + #include + ++#include ++ + namespace Tp + { + +diff -Nur telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-server.cpp telepathy-qt-0.9.1/TelepathyQt/stream-tube-server.cpp +--- telepathy-qt-0.9.1.orig/TelepathyQt/stream-tube-server.cpp 2012-04-01 17:44:00.003466134 +0000 ++++ telepathy-qt-0.9.1/TelepathyQt/stream-tube-server.cpp 2012-04-01 17:51:00.233486476 +0000 +@@ -38,6 +38,8 @@ + #include + #include + ++#include ++ + namespace Tp + { + diff --git a/testing/tomboy/PKGBUILD b/testing/tomboy/PKGBUILD new file mode 100644 index 000000000..e0f09d287 --- /dev/null +++ b/testing/tomboy/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 155272 2012-04-01 11:37:20Z heftig $ +# Maintainer: Jan de Groot + +pkgname=tomboy +pkgver=1.10.0 +pkgrel=1 +pkgdesc="Desktop note-taking application for Linux and Unix" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/tomboy/" +depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme') +makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') +options=('!libtool' '!emptydirs' '!makeflags') +groups=('gnome-extra') +install=tomboy.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('a0f6550560c03aabb311584694bc2a729e688ad94c5d9999137081edaba0c714') + +build() { + export MONO_SHARED_DIR="$srcdir/.wabi" + mkdir -p "$MONO_SHARED_DIR" + + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-update-mimedb + 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 tomboy $pkgdir/etc/gconf/schemas/*.schemas + rm -f $pkgdir/etc/gconf/schemas/*.schemas +} diff --git a/testing/tomboy/tomboy.install b/testing/tomboy/tomboy.install new file mode 100644 index 000000000..f8e2e4a07 --- /dev/null +++ b/testing/tomboy/tomboy.install @@ -0,0 +1,25 @@ +pkgname=tomboy + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime +} diff --git a/testing/totem-plparser/PKGBUILD b/testing/totem-plparser/PKGBUILD new file mode 100644 index 000000000..432e5f1c6 --- /dev/null +++ b/testing/totem-plparser/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 155276 2012-04-01 11:37:26Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=totem-plparser +pkgver=3.4.0 +pkgrel=1 +url="http://www.gnome.org" +pkgdesc="Totem playlist parser library" +license=('LGPL') +arch=(i686 x86_64) +depends=('gmime' 'libsoup-gnome' 'libarchive' 'libquvi') +makedepends=('intltool' 'gobject-introspection') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz) +sha256sums=('a9c9dd1c815f0a407546dd209c209284a846ae2978a82faf2b8d72e86a3b8cc7') + +build() { + cd totem-pl-parser-$pkgver + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static + make +} + +package(){ + cd totem-pl-parser-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/totem/PKGBUILD b/testing/totem/PKGBUILD new file mode 100644 index 000000000..387bed2c5 --- /dev/null +++ b/testing/totem/PKGBUILD @@ -0,0 +1,76 @@ +# $Id: PKGBUILD 155274 2012-04-01 11:37:23Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgbase=totem +pkgname=('totem' 'totem-plugin') +pkgver=3.4.0 +pkgrel=1 +pkgdesc="A GNOME3 integrated movie player based on Gstreamer." +url="http://www.gnome.org" +arch=('i686' 'x86_64') +license=('GPL2' 'custom') +depends=('gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'totem-plparser' 'libxxf86vm' + 'libxtst' 'desktop-file-utils' 'iso-codes' 'python2' 'libpeas' 'hicolor-icon-theme' + 'gnome-icon-theme-symbolic' 'gsettings-desktop-schemas' 'dconf' 'clutter-gst' + 'clutter-gtk' 'mx' 'python2-gobject' 'pylint') +makedepends=('intltool' 'gtk-doc' 'nautilus' 'libgdata' 'lirc-utils' + 'libepc' 'bluez' 'vala' 'grilo') +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz + browser-plugins.ini) +sha256sums=('683209ea6eeffa39c277bab02567e4ae8250f00719ef8dd3f30e5f4bdf1f0f9c' + 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e') + +build() { + cd "$pkgbase-$pkgver" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/totem \ + --localstatedir=/var \ + --disable-static \ + --enable-python \ + --enable-nautilus + make +} + +package_totem() { + groups=('gnome-extra') + install=totem.install + optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' + 'gstreamer0.10-bad-plugins: Extra media codecs' + 'gstreamer0.10-ffmpeg: Extra media codecs' + 'lirc-utils: Infrared Remote Control plugin' + 'libepc: Publish Playlist plugin' + 'libgdata: YouTube Browser plugin' + 'bluez: Bemused plugin' + 'grilo-plugins: Browse sidebar (remote media)' + 'pyxdg: opensubtitles plugin') + + cd "$pkgbase-$pkgver" + make DESTDIR="${pkgdir}" install + + rm -r "$pkgdir/usr/lib/mozilla" + rm "$pkgdir/usr/lib/totem/totem-plugin-viewer" + + sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \ + $pkgdir/usr/lib/totem/{totem/totem-bugreport.py,plugins/iplayer/iplayer2.py} + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING" +} + +package_totem-plugin() { + pkgdesc="Totem plugin for web browsers" + depends=("totem=$pkgver") + backup=(etc/totem/browser-plugins.ini) + + cd "$pkgbase-$pkgver" + make -C browser-plugin \ + plugindir=/usr/lib/mozilla/plugins \ + xptdir=/usr/lib/mozilla/plugins \ + DESTDIR="$pkgdir" install + + install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini" + + install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING" +} diff --git a/testing/totem/browser-plugins.ini b/testing/totem/browser-plugins.ini new file mode 100644 index 000000000..cf3014997 --- /dev/null +++ b/testing/totem/browser-plugins.ini @@ -0,0 +1,2 @@ +[Plugins] +application/x-shockwave-flash.disabled=true diff --git a/testing/totem/totem.install b/testing/totem/totem.install new file mode 100644 index 000000000..7f0fc704b --- /dev/null +++ b/testing/totem/totem.install @@ -0,0 +1,13 @@ +post_install() { + /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/tracker/PKGBUILD b/testing/tracker/PKGBUILD new file mode 100644 index 000000000..2e2b6437e --- /dev/null +++ b/testing/tracker/PKGBUILD @@ -0,0 +1,84 @@ +# $Id: PKGBUILD 155278 2012-04-01 11:37:30Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Sergej Pupykin +# Contributor: Alexander Fehr + +pkgbase=tracker +pkgname=(tracker libtracker-sparql) +pkgver=0.14.0 +_tver=${pkgver%.*} +pkgrel=1 +pkgdesc="All-in-one indexer, search tool and metadata database" +arch=('i686' 'x86_64') +license=('GPL') +makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' + 'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3' + 'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection' + 'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser' + 'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala') +url="http://www.gnome.org" +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) +sha256sums=('78e432c5c14b9d186ccca3c382accdcdb4f07c2c6e25989fda48401b4a68f7d4') + +build() { + cd $pkgbase-$pkgver + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/tracker \ + --disable-unit-tests \ + --enable-libflac \ + --enable-libvorbis + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package_tracker() { + depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring' + 'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca' + 'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme') + optdepends=('giflib: extractor for GIF data' + 'gstreamer0.10-base: video extractor' + 'totem-plparser: playlist support' + 'nautilus: nautilus-extension' + 'libvorbis: Vorbis metadata extractor' + 'flac: FLAC metadata extractor' + 'taglib: writeback for audio files' + 'gnome-panel: tracker-search-bar') + groups=('gnome-extra') + install=tracker.install + + cd $pkgbase-$pkgver + make DESTDIR="$pkgdir" install + +### Split libtracker-sparql + + mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver + mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig} + mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi} + + mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib" + + mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \ + "$srcdir/sparql/usr/lib/tracker-$_tver" + + mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \ + "$srcdir/sparql/usr/share/vala/vapi" + + mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql + mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib + mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc + mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir +} + +package_libtracker-sparql() { + pkgdesc="$pkgdesc (SPARQL library)" + depends=('sqlite3' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux') + + mv "$srcdir"/sparql/* "$pkgdir" +} diff --git a/testing/tracker/tracker.install b/testing/tracker/tracker.install new file mode 100644 index 000000000..95114273e --- /dev/null +++ b/testing/tracker/tracker.install @@ -0,0 +1,13 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch b/testing/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch new file mode 100644 index 000000000..d4d162167 --- /dev/null +++ b/testing/udev/0001-split-usr-always-read-config-files-from-lib-udev.patch @@ -0,0 +1,80 @@ +From f2bdace5bb68d4f3162f886b27210762d8b115b8 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen +Date: Sat, 3 Mar 2012 12:28:15 +0100 +Subject: [PATCH 1/2] split /usr: always read config files from /lib/udev + +This means we don't need a flagday in order to move udev to use +/usr/lib/udev/rules.d +--- + src/libudev.c | 25 ++++++++++++++++--------- + 1 file changed, 16 insertions(+), 9 deletions(-) + +diff --git a/src/libudev.c b/src/libudev.c +index be24329..754d713 100644 +--- a/src/libudev.c ++++ b/src/libudev.c +@@ -43,8 +43,8 @@ struct udev { + void *userdata; + char *sys_path; + char *dev_path; +- char *rules_path[4]; +- unsigned long long rules_path_ts[4]; ++ char *rules_path[5]; ++ unsigned long long rules_path_ts[5]; + int rules_path_count; + char *run_path; + struct udev_list properties_list; +@@ -255,21 +255,26 @@ UDEV_EXPORT struct udev *udev_new(void) + goto err; + + if (udev->rules_path[0] == NULL) { +- /* /usr/lib/udev -- system rules */ +- udev->rules_path[0] = strdup(PKGLIBEXECDIR "/rules.d"); ++ /* /lib/udev -- compat for system rules */ ++ udev->rules_path[0] = strdup("/lib/udev/rules.d"); + if (!udev->rules_path[0]) ++ goto err; ++ ++ /* /usr/lib/udev -- system rules */ ++ udev->rules_path[1] = strdup(PKGLIBEXECDIR "/rules.d"); ++ if (!udev->rules_path[1]) + goto err; + + /* /etc/udev -- local administration rules */ +- udev->rules_path[1] = strdup(SYSCONFDIR "/udev/rules.d"); +- if (!udev->rules_path[1]) ++ udev->rules_path[2] = strdup(SYSCONFDIR "/udev/rules.d"); ++ if (!udev->rules_path[2]) + goto err; + + /* /run/udev -- runtime rules */ +- if (asprintf(&udev->rules_path[2], "%s/rules.d", udev->run_path) < 0) ++ if (asprintf(&udev->rules_path[3], "%s/rules.d", udev->run_path) < 0) + goto err; + +- udev->rules_path_count = 3; ++ udev->rules_path_count = 4; + } + + dbg(udev, "context %p created\n", udev); +@@ -278,7 +283,8 @@ UDEV_EXPORT struct udev *udev_new(void) + dbg(udev, "dev_path='%s'\n", udev->dev_path); + dbg(udev, "sys_path='%s'\n", udev->sys_path); + dbg(udev, "run_path='%s'\n", udev->run_path); +- dbg(udev, "rules_path='%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1], udev->rules_path[2]); ++ dbg(udev, "rules_path='%s':'%s':'%s':'%s'\n", udev->rules_path[0], udev->rules_path[1], ++ udev->rules_path[2], udev->rules_path[3]); + free(config_file); + return udev; + err: +@@ -325,6 +331,7 @@ UDEV_EXPORT void udev_unref(struct udev *udev) + free(udev->rules_path[0]); + free(udev->rules_path[1]); + free(udev->rules_path[2]); ++ free(udev->rules_path[3]); + free(udev->run_path); + dbg(udev, "context %p released\n", udev); + free(udev); +-- +1.7.9.5 + diff --git a/testing/udev/0002-reinstate-TIMEOUT-handling.patch b/testing/udev/0002-reinstate-TIMEOUT-handling.patch new file mode 100644 index 000000000..9d1d36fb6 --- /dev/null +++ b/testing/udev/0002-reinstate-TIMEOUT-handling.patch @@ -0,0 +1,146 @@ +From 0a581062ee3e31e0c2aedc5eb64c60f52868b17f Mon Sep 17 00:00:00 2001 +From: Tom Gundersen +Date: Thu, 15 Mar 2012 02:12:43 +0100 +Subject: [PATCH 2/2] reinstate TIMEOUT= handling + +Without treating events with timeouts specially some drivers would cause a +30 seconds stall on boot: . + +I also received reports of some drivers not working at all, even after the +timeout. + +We will remove this patch when more drivers have been fixed in the kernel (3.4?). + +This reverts 43d5c5f03645c4b842659f9b5bd0ae465e885e92 and +57c6f8ae5f52a6e8ffc66a54966346f733dded39. +--- + TODO | 2 ++ + src/libudev-device.c | 19 +++++++++++++++++++ + src/libudev-private.h | 1 + + src/udevd.c | 13 ++++++++++--- + 4 files changed, 32 insertions(+), 3 deletions(-) + +diff --git a/TODO b/TODO +index 36e8440..c2e59b6 100644 +--- a/TODO ++++ b/TODO +@@ -1,6 +1,8 @@ + - find a way to tell udev to not cancel firmware + requests in initramfs + ++ - remove TIMEOUT= handling ++ + - move /lib/udev/devices/ to tmpfiles + + - trigger --subsystem-match=usb/usb_device +diff --git a/src/libudev-device.c b/src/libudev-device.c +index 10f28b8..639c367 100644 +--- a/src/libudev-device.c ++++ b/src/libudev-device.c +@@ -68,6 +68,7 @@ struct udev_device { + struct udev_list tags_list; + unsigned long long int seqnum; + unsigned long long int usec_initialized; ++ int timeout; + int devlink_priority; + int refcount; + dev_t devnum; +@@ -160,6 +161,21 @@ static int udev_device_set_devnum(struct udev_device *udev_device, dev_t devnum) + return 0; + } + ++int udev_device_get_timeout(struct udev_device *udev_device) ++{ ++ return udev_device->timeout; ++} ++ ++static int udev_device_set_timeout(struct udev_device *udev_device, int timeout) ++{ ++ char num[32]; ++ ++ udev_device->timeout = timeout; ++ snprintf(num, sizeof(num), "%u", timeout); ++ udev_device_add_property(udev_device, "TIMEOUT", num); ++ return 0; ++} ++ + const char *udev_device_get_devpath_old(struct udev_device *udev_device) + { + return udev_device->devpath_old; +@@ -414,6 +430,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device, + udev_device_set_devpath_old(udev_device, &property[12]); + } else if (strncmp(property, "SEQNUM=", 7) == 0) { + udev_device_set_seqnum(udev_device, strtoull(&property[7], NULL, 10)); ++ } else if (strncmp(property, "TIMEOUT=", 8) == 0) { ++ udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10)); + } else if (strncmp(property, "IFINDEX=", 8) == 0) { + udev_device_set_ifindex(udev_device, strtoull(&property[8], NULL, 10)); + } else if (strncmp(property, "DEVMODE=", 8) == 0) { +@@ -599,6 +617,7 @@ struct udev_device *udev_device_new(struct udev *udev) + udev_list_init(udev, &udev_device->sysattr_value_list, true); + udev_list_init(udev, &udev_device->sysattr_list, false); + udev_list_init(udev, &udev_device->tags_list, true); ++ udev_device->timeout = -1; + udev_device->watch_handle = -1; + /* copy global properties */ + udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev)) +diff --git a/src/libudev-private.h b/src/libudev-private.h +index 5f5c64a..ec63b67 100644 +--- a/src/libudev-private.h ++++ b/src/libudev-private.h +@@ -87,6 +87,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device); + void udev_device_set_is_initialized(struct udev_device *udev_device); + int udev_device_add_tag(struct udev_device *udev_device, const char *tag); + void udev_device_cleanup_tags_list(struct udev_device *udev_device); ++int udev_device_get_timeout(struct udev_device *udev_device); + unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device); + void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized); + int udev_device_get_devlink_priority(struct udev_device *udev_device); +diff --git a/src/udevd.c b/src/udevd.c +index 1702217..88e9272 100644 +--- a/src/udevd.c ++++ b/src/udevd.c +@@ -401,7 +401,7 @@ out: + } + } + +-static void event_run(struct event *event) ++static void event_run(struct event *event, bool force) + { + struct udev_list_node *loop; + +@@ -427,7 +427,7 @@ static void event_run(struct event *event) + return; + } + +- if (children >= children_max) { ++ if (!force && children >= children_max) { + if (children_max > 1) + info(event->udev, "maximum number (%i) of children reached\n", children); + return; +@@ -461,6 +461,13 @@ static int event_queue_insert(struct udev_device *dev) + + event->state = EVENT_QUEUED; + udev_list_node_append(&event->node, &event_list); ++ ++ /* run all events with a timeout set immediately */ ++ if (udev_device_get_timeout(dev) > 0) { ++ event_run(event, true); ++ return 0; ++ } ++ + return 0; + } + +@@ -577,7 +584,7 @@ static void event_queue_start(struct udev *udev) + continue; + } + +- event_run(event); ++ event_run(event, false); + } + } + +-- +1.7.9.5 + diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD index 5418f329c..6cbf2c97b 100644 --- a/testing/udev/PKGBUILD +++ b/testing/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153496 2012-03-15 01:33:05Z tomegun $ +# $Id: PKGBUILD 155338 2012-04-01 21:03:25Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Aaron Griffin # Contributor: Tobias Powalowski @@ -6,15 +6,16 @@ pkgname=udev pkgver=181 -pkgrel=5 +pkgrel=9 pkgdesc="The userspace dev tools (udev)" -depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'acl') +depends=('util-linux' 'glib2' 'kmod' 'pciutils' 'usbutils' 'bash' 'acl') install=udev.install arch=(i686 x86_64) license=('GPL') -makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod') +makedepends=('gobject-introspection' 'gperf' 'libxslt') source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz - 0001-reinstate-TIMEOUT-handling.patch + 0001-split-usr-always-read-config-files-from-lib-udev.patch + 0002-reinstate-TIMEOUT-handling.patch initcpio-hooks-udev initcpio-install-udev) url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" @@ -25,19 +26,23 @@ options=(!makeflags !libtool) build() { cd $srcdir/$pkgname-$pkgver - patch -p1 -i ../0001-reinstate-TIMEOUT-handling.patch + patch -p1 -i ../0001-split-usr-always-read-config-files-from-lib-udev.patch + patch -p1 -i ../0002-reinstate-TIMEOUT-handling.patch ./configure --prefix=/usr \ - --with-rootprefix= \ --sysconfdir=/etc \ - --libdir=/usr/lib \ - --libexecdir=/lib \ - --with-systemdsystemunitdir=/lib/systemd/system \ + --libexecdir=/usr/lib \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \ --enable-udev_acl make } - + +check() { + make -C "$pkgname-$pkgver" check +} + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=${pkgdir} install @@ -47,20 +52,24 @@ package() { install -D -m644 ../initcpio-install-udev ${pkgdir}/usr/lib/initcpio/install/udev # udevd moved, symlink to make life easy for restarting udevd manually - ln -s ../../lib/udev/udevd ${pkgdir}/usr/bin/udevd + ln -s ../lib/udev/udevd ${pkgdir}/usr/bin/udevd + # and for users of the old /lib location (to go away soon) + mkdir -p ${pkgdir}/lib/udev + ln -s ../../usr/lib/udev/udevd ${pkgdir}/lib/udev/udevd # the path to udevadm is hardcoded in some places install -d ${pkgdir}/sbin ln -s ../usr/bin/udevadm ${pkgdir}/sbin/udevadm # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group - for i in $pkgdir/lib/udev/rules.d/*.rules; do + for i in $pkgdir/usr/lib/udev/rules.d/*.rules; do sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; s#GROUP="tape"#GROUP="storage"#g; s#GROUP="cdrom"#GROUP="optical"#g' $i done } md5sums=('0d7af750702620a871b9f9b98d8ad859' - 'f758b3e62ab77a1a6b7be12bb900cb2d' + '02a0dbbdcba6c1eae3ef65b6b06bde1f' + 'a9fae85491a08d7759388c605389a8c5' 'a4dd853050bf2e0ae6b2e3d2c75499c2' - 'ee0bfe91a20fff12cc25ab1d1e024853') + 'd2b16edc6d806b5dafdbbad43ae5a3de') diff --git a/testing/udev/initcpio-install-udev b/testing/udev/initcpio-install-udev index e7e2c0f60..6bc9cfb28 100644 --- a/testing/udev/initcpio-install-udev +++ b/testing/udev/initcpio-install-udev @@ -4,14 +4,14 @@ build() { FILES="/etc/udev/udev.conf" SCRIPT="udev" - add_binary /lib/udev/udevd + add_binary /usr/lib/udev/udevd add_binary /usr/bin/udevadm for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do - add_file "/lib/udev/rules.d/$rules" + add_file "/usr/lib/udev/rules.d/$rules" done for tool in ata_id scsi_id; do - add_file "/lib/udev/$tool" + add_file "/usr/lib/udev/$tool" done } diff --git a/testing/udisks/PKGBUILD b/testing/udisks/PKGBUILD new file mode 100644 index 000000000..a6cd4435a --- /dev/null +++ b/testing/udisks/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 155331 2012-04-01 19:53:13Z tomegun $ +# Maintainer: Jan de Groot + +pkgname=udisks +pkgver=1.0.4 +pkgrel=3 +pkgdesc="Disk Management Service" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/udisks" +license=('GPL') +depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject') +makedepends=('intltool' 'docbook-xsl') +options=(!libtool) +source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz) +sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/udisks --disable-static + #fix location for bash_completion helper + sed -i -e 's|profile.d|bash_completion.d|' tools/Makefile + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + # move udev helpers and rules to /usr/lib + mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/ + rm -r "${pkgdir}"/lib +} diff --git a/testing/udisks2/PKGBUILD b/testing/udisks2/PKGBUILD new file mode 100644 index 000000000..1b8ef3ec5 --- /dev/null +++ b/testing/udisks2/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 155280 2012-04-01 11:37:34Z heftig $ +# Maintainer: Ionut Biru + +pkgname=udisks2 +pkgver=1.93.0 +pkgrel=1 +pkgdesc="Disk Management Service, version 2" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/udisks" +license=('GPL2') +depends=('glib2' 'udev' 'polkit' 'libatasmart' 'eject') +makedepends=('intltool' 'docbook-xsl' 'gobject-introspection') +optdepends=('parted: partition management' + 'gptfdisk: GUID partition table support') +options=(!libtool) +source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2) +sha256sums=('e2264d06bbf5399d243b0f91628881fa1d95d1a512b2af26f5ab074caf6327d7') + +build() { + cd "udisks-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --with-systemdsystemunitdir=/lib/systemd/system \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "udisks-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/vala/PKGBUILD b/testing/vala/PKGBUILD new file mode 100644 index 000000000..4fa7a3591 --- /dev/null +++ b/testing/vala/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 155282 2012-04-01 11:37:37Z heftig $ +# Maintainer : Ionut Biru +# Contributor: Timm Preetz + +pkgname=vala +pkgver=0.16.0 +pkgrel=1 +pkgdesc="Compiler for the GObject type system" +arch=('i686' 'x86_64') +url="http://live.gnome.org/Vala" +license=('LGPL') +depends=('glib2') +makedepends=('libxslt') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('3adb37aa2b35e2e2daed47552e85dbcbf752c0f7768b269d856993620073a657') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --enable-vapigen + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/testing/vinagre/PKGBUILD b/testing/vinagre/PKGBUILD new file mode 100644 index 000000000..37d9c1451 --- /dev/null +++ b/testing/vinagre/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 155284 2012-04-01 11:37:42Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot +# Contributor: Allan McRae +# Contributor: lp76 + +pkgname=vinagre +pkgver=3.4.0 +pkgrel=1 +pkgdesc="A VNC Client for the GNOME Desktop" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/vinagre/" +install=vinagre.install +depends=('libgnome-keyring' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme') +optdepends=('openssh: SSH plugin' + 'rdesktop: RDP plugin') +makedepends=('gnome-doc-utils' 'intltool' 'rdesktop' 'openssh' 'itstool') +groups=('gnome-extra') +options=('!emptydirs' '!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('0379e679204e9ddf63670acc9a902e70d7c3d26eb5070ceb5826a6fbbfdf1489') + +build() { + cd $pkgname-$pkgver + + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/vinagre/vinagre.install b/testing/vinagre/vinagre.install new file mode 100644 index 000000000..68158ac80 --- /dev/null +++ b/testing/vinagre/vinagre.install @@ -0,0 +1,20 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime > /dev/null +} + +pre_upgrade() { + if (( $(vercmp $2 2.91.91-2) < 0 )); then + usr/sbin/gconfpkg --uninstall vinagre + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/vino/PKGBUILD b/testing/vino/PKGBUILD new file mode 100644 index 000000000..1dbc501ab --- /dev/null +++ b/testing/vino/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 155286 2012-04-01 11:37:46Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=vino +pkgver=3.4.0 +pkgrel=1 +pkgdesc="a VNC server for the GNOME desktop" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libgnome-keyring' 'avahi' 'desktop-file-utils') +makedepends=('intltool' 'networkmanager') +groups=('gnome-extra') +url="http://www.gnome.org" +options=(!emptydirs) +install=vino.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('a6b5c3bc185d29ff9861c3519b97973321d1465c8f9e5aa7f93f007cac9d67da') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/vino \ + --localstatedir=/var \ + --enable-gnome-keyring \ + --enable-avahi \ + --disable-http-server + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/vino/vino.install b/testing/vino/vino.install new file mode 100644 index 000000000..469266843 --- /dev/null +++ b/testing/vino/vino.install @@ -0,0 +1,18 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall vino + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/vte3/PKGBUILD b/testing/vte3/PKGBUILD new file mode 100644 index 000000000..08bcd7236 --- /dev/null +++ b/testing/vte3/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 155288 2012-04-01 11:37:49Z heftig $ +# Maintainer: Ionut Biru + +pkgbase=vte3 +pkgname=(vte3 vte-common) +pkgver=0.32.0 +pkgrel=1 +pkgdesc="Virtual Terminal Emulator widget for use with GTK3" +arch=('i686' 'x86_64') +license=('LGPL') +options=('!libtool' '!emptydirs') +makedepends=('intltool' 'gobject-introspection' 'gtk3') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/GNOME/sources/vte/${pkgver%.*}/vte-$pkgver.tar.xz +make_alt_work.patch::http://git.gnome.org/browse/vte/patch/?id=b73782a28894e25ed146271f9d6c6775a6836199) +sha256sums=('9fda2576265d9cad43f96dd55f5889b4bb9a2c80a4ff870a1219fd3e171b0583' + '8307623b13bcaf214cc25207ee7afaf65575d334623460311c24437fbbae14d3') + +build() { + cd "vte-$pkgver" + patch -Np1 -R -i "$srcdir/make_alt_work.patch" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/vte \ + --localstatedir=/var --disable-static \ + --enable-introspection + make +} + +package_vte3(){ + depends=('gtk3' 'vte-common') + cd "vte-$pkgver" + make DESTDIR="$pkgdir" install + + rm "$pkgdir"/usr/lib/vte/gnome-pty-helper +} + +package_vte-common() { + pkgdesc="Common files used by vte and vte3" + cd "vte-$pkgver" + + make -C gnome-pty-helper DESTDIR="$pkgdir" install +} diff --git a/testing/xdg-user-dirs-gtk/PKGBUILD b/testing/xdg-user-dirs-gtk/PKGBUILD new file mode 100644 index 000000000..ad5476139 --- /dev/null +++ b/testing/xdg-user-dirs-gtk/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 155290 2012-04-01 11:37:53Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=xdg-user-dirs-gtk +pkgver=0.8 +pkgrel=1 +pkgdesc="Creates user dirs and asks to relocalize them" +arch=(i686 x86_64) +license=('GPL') +depends=('gtk2' 'xdg-user-dirs') +makedepends=('intltool') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org" +groups=('gnome') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.bz2 + lxde.patch) +sha256sums=('971e5cd121606c437c2b07e189c8f34791ae0c4d81e155266d71acc7b263ad32' + '5db6a2fd5bb293deff0322e9f20a383130e05df2d35d64568a47b5fe63d6ebf4') + +build() { + cd $pkgname-$pkgver + patch -p1 -i ../lxde.patch + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/xdg-user-dirs-gtk/lxde.patch b/testing/xdg-user-dirs-gtk/lxde.patch new file mode 100644 index 000000000..c5520475c --- /dev/null +++ b/testing/xdg-user-dirs-gtk/lxde.patch @@ -0,0 +1,15 @@ +diff -up xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in.lxde xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in +--- xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in.lxde 2010-02-13 23:52:49.130115833 -0500 ++++ xdg-user-dirs-gtk-0.8/user-dirs-update-gtk.desktop.in 2010-02-13 23:54:57.574114211 -0500 +@@ -1,10 +1,9 @@ + [Desktop Entry] +-Encoding=UTF-8 + Exec=xdg-user-dirs-gtk-update + _Name=User folders update + _Comment=Update common folders names to match current locale + Terminal=false +-OnlyShowIn=GNOME; ++OnlyShowIn=GNOME;LXDE; + Type=Application + StartupNotify=false + X-KDE-autostart-after=panel diff --git a/testing/yelp/PKGBUILD b/testing/yelp/PKGBUILD new file mode 100644 index 000000000..faafcb616 --- /dev/null +++ b/testing/yelp/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 155292 2012-04-01 11:37:55Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=yelp +pkgver=3.4.0 +pkgrel=1 +pkgdesc="A help browser for GNOME" +arch=('i686' 'x86_64') +depends=('libwebkit3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2' + 'desktop-file-utils' 'dconf') +makedepends=('intltool' 'gtk-doc' 'itstool') +groups=('gnome') +license=('GPL') +options=('!emptydirs' '!libtool') +url="http://www.gnome.org" +install=yelp.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('d79f4084c38410b79ad3833ad886eb38cda1fd9ee604daed1d92c58ed89fd348') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/testing/yelp/yelp.install b/testing/yelp/yelp.install new file mode 100644 index 000000000..2a1cb91e9 --- /dev/null +++ b/testing/yelp/yelp.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/zenity/PKGBUILD b/testing/zenity/PKGBUILD new file mode 100644 index 000000000..b3b638e8b --- /dev/null +++ b/testing/zenity/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 155296 2012-04-01 11:38:01Z heftig $ +# Maintainer: Jan de Groot + +pkgname=zenity +pkgver=3.4.0 +pkgrel=1 +pkgdesc="Display graphical dialog boxes from shell scripts" +arch=(i686 x86_64) +license=('LGPL') +depends=('gtk3' 'libnotify') +makedepends=('intltool' 'gtk-doc') +url="http://www.gnome.org" +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('5cf068597c649b5adee60c5948abdf383dbfb16a6c6d57c2ec42ced136730baf') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} -- cgit v1.2.3-54-g00ecf