diff options
55 files changed, 1416 insertions, 1257 deletions
diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD index 340cf8faf..11d84fd02 100644 --- a/community/audit/PKGBUILD +++ b/community/audit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79970 2012-11-15 08:39:27Z mtorromeo $ +# $Id: PKGBUILD 82354 2013-01-16 08:38:43Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> # Contributor: Connor Behan <connor.behan@gmail.com> # Contributor: henning mueller <henning@orgizm.net> pkgname=audit -pkgver=2.2.1 -pkgrel=4 +pkgver=2.2.2 +pkgrel=1 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.' url=http://people.redhat.com/sgrubb/$pkgname arch=(i686 x86_64) @@ -59,7 +59,7 @@ package() { sed -ri 's| /sbin| /usr/sbin|' etc/audit/*.conf etc/audisp/plugins.d/*.conf } -sha256sums=('9865ca89f5b975ccf25441ddf45a874448f2bba944005aa8cd5e3c3148713a63' +sha256sums=('8bc2b45a5f08f5df6cebcd5543f24b7e68e28b64da4b23f08de2c6616384302b' '1e374ff164667b6a11f84c825a39996b449dc712d573996907cd47f063bf0dd5' '3c7179f40216b594675f26bb73884406c8ac91577b609dd1ab9837f889954007' - 'e60c031c6354f41938447c439eadee77127307687a2c487a54fab884eeafd9c2') + '6adadb405bebe99bb6a50e80e7c1a356996626e135d566283448fe4019fff3a4') diff --git a/community/audit/python2.patch b/community/audit/python2.patch index b5f6cbc25..87286fc5b 100644 --- a/community/audit/python2.patch +++ b/community/audit/python2.patch @@ -1,10 +1,10 @@ ---- configure.old 2010-10-22 15:54:13.193333452 +0200 -+++ configure 2010-10-22 15:54:52.546667020 +0200 -@@ -10662,7 +10662,7 @@ +--- configure.orig 2013-01-16 09:19:32.475800853 +0100 ++++ configure 2013-01-16 09:20:45.764146581 +0100 +@@ -13076,7 +13076,7 @@ # Find any Python interpreter. if test -z "$PYTHON"; then -- for ac_prog in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 +- for ac_prog in python python2 python3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 + for ac_prog in python2 do # Extract the first word of "$ac_prog", so it can be a program name with args. diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD index 825faff17..7f8b7c820 100644 --- a/community/cantata/PKGBUILD +++ b/community/cantata/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81241 2012-12-14 11:41:36Z andrea $ +# $Id: PKGBUILD 82406 2013-01-16 22:11:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Mcder3 <mcder3[at]gmail[dot]com> # Contributor: MisterFred <mister.fred[at]free[dot]fr> pkgname=cantata -pkgver=0.9.1 +pkgver=0.9.2 pkgdesc="A KDE client for the music player daemon (MPD)" pkgrel=1 arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('kdebase-runtime' 'taglib-extras' 'ffmpeg' 'mpg123' 'libmtp' 'speex') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://cantata.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") -md5sums=('78e2f379fe9a0afd32e24de83f1c283e') +md5sums=('882cec90eb01d190b899689675e990b0') build() { mkdir build diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 1fe51519c..cf564b236 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82292 2013-01-14 13:51:46Z spupykin $ +# $Id: PKGBUILD 82360 2013-01-16 10:08:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christian Himpel <chressie at gmail dot com> # Contributor: Johannes Hanika <hanatos at gmail dot com> @@ -6,7 +6,7 @@ pkgname=darktable pkgver=1.1.2 _pkgver=1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') url=http://darktable.sf.net/ diff --git a/community/darktable/darktable.install b/community/darktable/darktable.install index 8ea5d73af..24b15a4f5 100644 --- a/community/darktable/darktable.install +++ b/community/darktable/darktable.install @@ -2,12 +2,8 @@ post_install() { [ -x `which update-desktop-database 2>/dev/null` ] && update-desktop-database -q } -pre_upgrade() { - pre_remove -} - post_upgrade() { - post_install + [ -x `which update-desktop-database 2>/dev/null` ] && update-desktop-database -q } post_remove() { diff --git a/community/freehdl/PKGBUILD b/community/freehdl/PKGBUILD index 21eda19dd..02bd0aad6 100644 --- a/community/freehdl/PKGBUILD +++ b/community/freehdl/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 74820 2012-08-06 09:08:00Z spupykin $ +# $Id: PKGBUILD 82362 2013-01-16 10:08:50Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Neil Darlow <neil@darlow.co.uk> # Contributor: Jens Maucher <defcon@archlinux.us> pkgname=freehdl pkgver=0.0.8 -pkgrel=4 +pkgrel=5 pkgdesc='An open-source (C++ generating) VHDL simulator' arch=('i686' 'x86_64') url='http://freehdl.seul.org' license=('GPL') depends=('perl') optdepends=('gtkwave: to view output when run standalone') -options=('!libtool') +options=('libtool') install=${pkgname}.install source=("http://downloads.sourceforge.net/qucs/$pkgname-$pkgver.tar.gz") md5sums=('aa1382b8b5c6a972e9652c648a9278b5') diff --git a/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch index 03b662c86..ceee6db82 100644 --- a/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch +++ b/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch @@ -31,16 +31,16 @@ index 7e50db4..b0e907c 100644 --- a/plugins/common/Makefile.am +++ b/plugins/common/Makefile.am @@ -6,9 +6,7 @@ libcommon_la_SOURCES = \ - gsd-keygrab.c \ - gsd-keygrab.h \ - gsd-input-helper.c \ + gsd-keygrab.c \ + gsd-keygrab.h \ + gsd-input-helper.c \ - gsd-input-helper.h \ - gsd-power-helper.c \ - gsd-power-helper.h + gsd-input-helper.h - + libcommon_la_CPPFLAGS = \ - $(AM_CPPFLAGS) + $(AM_CPPFLAGS) diff --git a/plugins/common/gsd-power-helper.c b/plugins/common/gsd-power-helper.c deleted file mode 100644 index 27d0eda..0000000 @@ -300,7 +300,7 @@ index 9c84d7f..a2f277e 100644 #include <gtk/gtk.h> #include <gio/gdesktopappinfo.h> +#include <gio/gunixfdlist.h> - + #ifdef HAVE_GUDEV #include <gudev/gudev.h> @@ -51,7 +52,6 @@ @@ -309,27 +309,27 @@ index 9c84d7f..a2f277e 100644 #include "gsd-input-helper.h" -#include "gsd-power-helper.h" #include "gsd-enums.h" - + #include <canberra.h> @@ -105,6 +105,10 @@ static const gchar introspection_xml[] = #define KEY_CURRENT_INPUT_SOURCE "current" #define KEY_INPUT_SOURCES "sources" - + +#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" +#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" +#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" + #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate)) - + typedef struct { @@ -148,10 +152,13 @@ struct GsdMediaKeysManagerPrivate - + /* Power stuff */ GSettings *power_settings; - GDBusProxy *upower_proxy; GDBusProxy *power_screen_proxy; GDBusProxy *power_keyboard_proxy; - + + /* systemd stuff */ + GDBusProxy *logind_proxy; + gint inhibit_keys_fd; @@ -339,7 +339,7 @@ index 9c84d7f..a2f277e 100644 GSList *screens; @@ -1618,6 +1625,38 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager) } - + static void +power_action_suspend (GsdMediaKeysManager *manager) +{ @@ -396,7 +396,7 @@ index 9c84d7f..a2f277e 100644 @@ -2248,6 +2287,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager) } #endif /* HAVE_GUDEV */ - + + g_clear_object (&priv->logind_proxy); if (priv->settings) { g_object_unref (priv->settings); @@ -404,7 +404,7 @@ index 9c84d7f..a2f277e 100644 @@ -2268,11 +2308,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager) priv->power_keyboard_proxy = NULL; } - + - if (priv->upower_proxy) { - g_object_unref (priv->upower_proxy); - priv->upower_proxy = NULL; @@ -415,7 +415,7 @@ index 9c84d7f..a2f277e 100644 g_object_unref (priv->cancellable); @@ -2363,9 +2398,85 @@ gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass) } - + static void +inhibit_done (GObject *source, + GAsyncResult *result, @@ -497,20 +497,20 @@ index 9c84d7f..a2f277e 100644 + manager); + } - + static void @@ -2382,6 +2493,8 @@ gsd_media_keys_manager_finalize (GObject *object) - + if (media_keys_manager->priv->start_idle_id != 0) g_source_remove (media_keys_manager->priv->start_idle_id); + if (media_keys_manager->priv->inhibit_keys_fd != -1) + close (media_keys_manager->priv->inhibit_keys_fd); - + G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object); } @@ -2401,21 +2514,6 @@ xrandr_ready_cb (GObject *source_object, } - + static void -upower_ready_cb (GObject *source_object, - GAsyncResult *res, @@ -545,7 +545,7 @@ index 9c84d7f..a2f277e 100644 - (GAsyncReadyCallback) upower_ready_cb, - manager); } - + GsdMediaKeysManager * diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c index 1c594d8..bb7224c 100644 @@ -565,7 +565,7 @@ index 1c594d8..bb7224c 100644 #include <libnotify/notify.h> #include <canberra-gtk.h> +#include <gio/gunixfdlist.h> - + #define GNOME_DESKTOP_USE_UNSTABLE_API #include <libgnome-desktop/gnome-rr.h> @@ -43,7 +44,6 @@ @@ -573,20 +573,20 @@ index 1c594d8..bb7224c 100644 #include "gsd-enums.h" #include "gsd-power-manager.h" -#include "gsd-power-helper.h" - + #define GNOME_SESSION_DBUS_NAME "org.gnome.SessionManager" #define GNOME_SESSION_DBUS_PATH "/org/gnome/SessionManager" @@ -78,6 +78,10 @@ #define GSD_POWER_MANAGER_RECALL_DELAY 30 /* seconds */ #define GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT 30 /* seconds */ - + +#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" +#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" +#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" + /* Keep this in sync with gnome-shell */ #define SCREENSAVER_FADE_TIME 10 /* seconds */ - + @@ -193,15 +197,21 @@ struct GsdPowerManagerPrivate ca_context *canberra_context; ca_proplist *critical_alert_loop_props; @@ -609,7 +609,7 @@ index 1c594d8..bb7224c 100644 + gboolean inhibit_suspend_taken; + guint inhibit_lid_switch_timer_id; }; - + enum { @@ -218,8 +228,8 @@ static GIcon *engine_get_icon (GsdPowerManager *manager); static gchar *engine_get_summary (GsdPowerManager *manager); @@ -619,12 +619,12 @@ index 1c594d8..bb7224c 100644 -static void kill_lid_close_safety_timer (GsdPowerManager *manager); +static void uninhibit_lid_switch (GsdPowerManager *manager); +static gboolean external_monitor_is_connected (GnomeRRScreen *screen); - + G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT) - + @@ -2049,6 +2059,57 @@ gnome_session_shutdown (void) } - + static void +action_poweroff (GsdPowerManager *manager) +{ @@ -681,7 +681,7 @@ index 1c594d8..bb7224c 100644 GsdPowerActionType action_type) { @@ -2057,19 +2118,19 @@ do_power_action_type (GsdPowerManager *manager, - + switch (action_type) { case GSD_POWER_ACTION_SUSPEND: - gsd_power_suspend (manager->priv->upower_proxy); @@ -706,7 +706,7 @@ index 1c594d8..bb7224c 100644 @@ -2141,85 +2202,20 @@ upower_kbd_toggle (GsdPowerManager *manager, return ret; } - + -static void -do_lid_open_action (GsdPowerManager *manager) -{ @@ -777,7 +777,7 @@ index 1c594d8..bb7224c 100644 + manager->priv->inhibit_lid_switch_timer_id = 0; + return G_SOURCE_REMOVE; } - + - return TRUE; -} - @@ -797,7 +797,7 @@ index 1c594d8..bb7224c 100644 + g_debug ("external monitor still there; trying again later"); + return G_SOURCE_CONTINUE; } - + /* Sets up a timer to be triggered some seconds after closing the laptop lid @@ -2227,82 +2223,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager) * again in the timeout handler to see if we can suspend then. @@ -813,7 +813,7 @@ index 1c594d8..bb7224c 100644 + } + + g_debug ("setting up lid close safety timer"); - + - manager->priv->lid_close_safety_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT, - (GSourceFunc) lid_close_safety_timer_cb, + manager->priv->inhibit_lid_switch_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT, @@ -822,7 +822,7 @@ index 1c594d8..bb7224c 100644 - g_source_set_name_by_id (manager->priv->lid_close_safety_timer_id, "[GsdPowerManager] lid close safety timer"); + g_source_set_name_by_id (manager->priv->inhibit_lid_switch_timer_id, "[GsdPowerManager] lid close safety timer"); } - + static void -kill_lid_close_safety_timer (GsdPowerManager *manager) +restart_inhibit_lid_switch_timer (GsdPowerManager *manager) @@ -837,7 +837,7 @@ index 1c594d8..bb7224c 100644 + setup_inhibit_lid_switch_timer (manager); } } - + static void -suspend_with_lid_closed (GsdPowerManager *manager) +do_lid_open_action (GsdPowerManager *manager) @@ -845,7 +845,7 @@ index 1c594d8..bb7224c 100644 gboolean ret; GError *error = NULL; - GsdPowerActionType action_type; - + - /* maybe lock the screen if the lid is closed */ - lock_screensaver (manager); - @@ -873,7 +873,7 @@ index 1c594d8..bb7224c 100644 + /* TRANSLATORS: this is the sound description */ + CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"), + NULL); - + - /* ensure we turn the panel back on after resume */ + /* ensure we turn the panel back on after lid open */ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, @@ -886,7 +886,7 @@ index 1c594d8..bb7224c 100644 error->message); g_clear_error (&error); } - + - /* only toggle keyboard if present and not already toggled */ - if (manager->priv->upower_kdb_proxy && - manager->priv->kbd_brightness_old == -1) { @@ -904,7 +904,7 @@ index 1c594d8..bb7224c 100644 - - do_power_action_type (manager, action_type); } - + static void do_lid_closed_action (GsdPowerManager *manager) { @@ -917,7 +917,7 @@ index 1c594d8..bb7224c 100644 @@ -2310,21 +2297,22 @@ do_lid_closed_action (GsdPowerManager *manager) CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"), NULL); - + + /* turn the panel off if the lid is closed (mainly for Dells...) */ + ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, + GNOME_RR_DPMS_OFF, @@ -930,7 +930,7 @@ index 1c594d8..bb7224c 100644 + /* refresh RANDR so we get an accurate view of what monitors are plugged in when the lid is closed */ gnome_rr_screen_refresh (manager->priv->x11_screen, NULL); /* NULL-GError */ - + - /* perform policy action */ - if (g_settings_get_boolean (manager->priv->settings, "lid-close-suspend-with-external-monitor") - || non_laptop_outputs_are_all_off (manager->priv->x11_screen)) { @@ -942,7 +942,7 @@ index 1c594d8..bb7224c 100644 - } + restart_inhibit_lid_switch_timer (manager); } - + - static void up_client_changed_cb (UpClient *client, GsdPowerManager *manager) @@ -952,12 +952,12 @@ index 1c594d8..bb7224c 100644 return; manager->priv->lid_is_closed = tmp; + g_debug ("up changed: lid is now %s", tmp ? "closed" : "open"); - + /* fake a keypress */ if (tmp) @@ -3302,30 +3291,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass) } - + static void -sleep_cb_screensaver_proxy_ready_cb (GObject *source_object, - GAsyncResult *res, @@ -988,14 +988,14 @@ index 1c594d8..bb7224c 100644 const gchar *signal_name, @@ -3477,75 +3442,38 @@ out: } - + static void -lock_screensaver (GsdPowerManager *manager) +lock_screensaver (GsdPowerManager *manager, + GSourceFunc done_cb) { gboolean do_lock; - + do_lock = g_settings_get_boolean (manager->priv->settings_screensaver, "lock-enabled"); - if (!do_lock) @@ -1048,7 +1048,7 @@ index 1c594d8..bb7224c 100644 - G_DBUS_CALL_FLAGS_NONE, - -1, NULL, NULL, NULL); } - + - /* close existing notifications on resume, the system power - * state is probably different now */ - notify_close_if_showing (manager->priv->notification_low); @@ -1084,12 +1084,12 @@ index 1c594d8..bb7224c 100644 + */ + g_timeout_add (500, done_cb, manager); } - + static void @@ -3755,6 +3683,287 @@ out: return ret; } - + +static void +inhibit_lid_switch_done (GObject *source, + GAsyncResult *result, @@ -1377,7 +1377,7 @@ index 1c594d8..bb7224c 100644 @@ -3764,6 +3973,25 @@ gsd_power_manager_start (GsdPowerManager *manager, g_debug ("Starting power manager"); gnome_settings_profile_start (NULL); - + + manager->priv->logind_proxy = + g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, + 0, @@ -1412,19 +1412,19 @@ index 1c594d8..bb7224c 100644 g_signal_connect (manager->priv->up_client, "device-added", G_CALLBACK (engine_device_added_cb), manager); @@ -3895,6 +4119,9 @@ gsd_power_manager_start (GsdPowerManager *manager, - manager->priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error); - if (manager->priv->x11_screen == NULL) - return FALSE; + G_CALLBACK (idle_idletime_reset_cb), manager); + g_signal_connect (manager->priv->idletime, "alarm-expired", + G_CALLBACK (idle_idletime_alarm_expired_cb), manager); + g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager); + /* set up initial state */ + on_randr_event (manager->priv->x11_screen, manager); - + /* ensure the default dpms timeouts are cleared */ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, @@ -3927,6 +4154,11 @@ gsd_power_manager_stop (GsdPowerManager *manager) { g_debug ("Stopping power manager"); - + + if (manager->priv->inhibit_lid_switch_timer_id != 0) { + g_source_remove (manager->priv->inhibit_lid_switch_timer_id); + manager->priv->inhibit_lid_switch_timer_id = 0; @@ -1436,11 +1436,11 @@ index 1c594d8..bb7224c 100644 @@ -3938,8 +4170,6 @@ gsd_power_manager_stop (GsdPowerManager *manager) manager->priv->introspection_data = NULL; } - + - kill_lid_close_safety_timer (manager); - g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager); - + g_clear_object (&manager->priv->connection); @@ -3947,6 +4177,19 @@ gsd_power_manager_stop (GsdPowerManager *manager) g_clear_object (&manager->priv->settings); @@ -1460,7 +1460,7 @@ index 1c594d8..bb7224c 100644 + + g_clear_object (&manager->priv->logind_proxy); g_clear_object (&manager->priv->x11_screen); - + g_ptr_array_unref (manager->priv->devices_array); @@ -3980,6 +4223,8 @@ static void gsd_power_manager_init (GsdPowerManager *manager) @@ -1469,8 +1469,8 @@ index 1c594d8..bb7224c 100644 + manager->priv->inhibit_lid_switch_fd = -1; + manager->priv->inhibit_suspend_fd = -1; } - + static void --- +-- 1.8.0 diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD index 8c622289a..e4125e240 100644 --- a/community/gnome-settings-daemon-updates/PKGBUILD +++ b/community/gnome-settings-daemon-updates/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80371 2012-11-21 04:26:48Z jconder $ +# $Id: PKGBUILD 82410 2013-01-16 23:40:08Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> _pkgname=gnome-settings-daemon pkgname=$_pkgname-updates -pkgver=3.6.3 -pkgrel=1 +pkgver=3.6.4 +pkgrel=2 pkgdesc="Updates plugin for the GNOME Settings daemon" arch=('i686' 'x86_64') license=('GPL') @@ -14,11 +14,11 @@ options=('!emptydirs' '!libtool') install=$_pkgname.install url="http://www.gnome.org" source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz" - '0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch' - 'arch.patch') -sha256sums=('606aaaba9cc7f51035702aead46c8bb595917a09cb947b396a579ea443328cdc' - 'c4aab9b45346fbae18808358346208f989cce8bf9c9eb753e2af7eca73715109' - '32f18a02698bb24aa8ae293eb7bf74a8261e3ce2c5149d259a87bd14500089ea') + '0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch' + 'arch.patch') +sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15' + 'dbea64c93db308cbcae52cf0c512986c6f07a0bd5023b0641255416af863011e' + '32f18a02698bb24aa8ae293eb7bf74a8261e3ce2c5149d259a87bd14500089ea') build() { cd "$srcdir/$_pkgname-$pkgver" @@ -27,7 +27,8 @@ build() { patch -Np1 -i "$srcdir/arch.patch" aclocal - automake + autoconf + automake --add-missing ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -44,7 +45,4 @@ build() { package() { cd "$srcdir/$_pkgname-$pkgver" make -C 'plugins/updates' DESTDIR="${pkgdir}" install - - _schema='org.gnome.settings-daemon.plugins.updates.gschema.xml' - install -D -m644 "data/$_schema" "$pkgdir/usr/share/glib-2.0/schemas/$_schema" } diff --git a/community/golangide/PKGBUILD b/community/golangide/PKGBUILD index d1ac57b1b..722b757d0 100644 --- a/community/golangide/PKGBUILD +++ b/community/golangide/PKGBUILD @@ -1,10 +1,10 @@ -#$Id: PKGBUILD 82255 2013-01-13 15:22:19Z arodseth $ +#$Id: PKGBUILD 82408 2013-01-16 23:36:09Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: spambanane <happy.house@gmx.de> # Contributor: Matteo <matteo.dek@gmail.com> pkgname=golangide -pkgver=15.2 +pkgver=16 pkgrel=1 pkgdesc='IDE for editing and building projects written in the Go programming language (now LiteIDE X)' license=('LGPL') @@ -14,12 +14,14 @@ depends=('go' 'libpng12' 'glib2' 'qt' 'qjson' 'qtwebkit') makedepends=('gendesk') options=('!strip') _name=('Golang IDE') +# http://$pkgname.googlecode.com/files/liteidex$pkgver.linux-386-webkit.tar.bz2 +# http://$pkgname.googlecode.com/files/liteidex$pkgver.linux-amd64-webkit.tar.bz2 source=("$pkgname.tgz::https://nodeload.github.com/visualfc/liteide/tar.gz/master" 'golangide.png' 'golangide.sh') -sha256sums=('95ec1bbdcc8b50e708643ad9c8970042e92d2a2fce4a5bdf2d098c073305e94f' +sha256sums=('ad40b86cace58bf85bf94e09d9dfc353cbdb31f09566bfd9487d15f321fbe078' '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697' - '9b1844a1e3a611760c2d2072b539cca0d2eed1584e1bf04a7fdd8d171e3cd775') + 'aa5ea27f9c3626431a9cb45e5267771a1eeff48b2e3927c0574eaef9302cfd74') build() { cd "$srcdir" @@ -40,19 +42,21 @@ build() { } package() { - cd "$srcdir/liteide-master/liteidex" - msg2 'Creating directories...' mkdir -p "$pkgdir/usr/lib/liteide" mkdir -p "$pkgdir/usr/share/liteide" mkdir -p "$pkgdir/usr/share/doc/$pkgname" + cd "$srcdir/liteide-master/build/liteide" + msg2 'Packaging executables...' - for binary in goastview goapi goexec godocview liteidex; do + for binary in goastview goapi goexec godocview liteide; do install -Dm755 "bin/$binary" "$pkgdir/usr/bin/$binary" done install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname" + cd "$srcdir/liteide-master/liteidex" + msg2 'Packaging resources...' cp -r deploy/* "$pkgdir/usr/share/liteide" cp -r os_deploy/* "$pkgdir/usr/share/liteide" diff --git a/community/golangide/golangide.sh b/community/golangide/golangide.sh index 70705e5f3..736727ed7 100644 --- a/community/golangide/golangide.sh +++ b/community/golangide/golangide.sh @@ -1,7 +1,8 @@ #!/bin/sh +ELF=/usr/bin/liteide # The libqjson issue has been reported upstream if [ ! -z $GOROOT -a -e $GOROOT ]; then - LD_PRELOAD=/usr/lib/libqjson.so /usr/bin/liteidex $@ + LD_PRELOAD=/usr/lib/libqjson.so $ELF $@ else - GOROOT=/usr/lib/go LD_PRELOAD=/usr/lib/libqjson.so /usr/bin/liteidex $@ + GOROOT=/usr/lib/go LD_PRELOAD=/usr/lib/libqjson.so $ELF $@ fi diff --git a/community/ibus-rime/PKGBUILD b/community/ibus-rime/PKGBUILD index 58eba088d..77ebf8420 100644 --- a/community/ibus-rime/PKGBUILD +++ b/community/ibus-rime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82230 2013-01-12 17:16:35Z fyan $ +# $Id: PKGBUILD 82388 2013-01-16 12:33:42Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: GONG Chen <chen dot sst at gmail dot com> # Contributor: 網軍總司令 pkgname=ibus-rime -pkgver=0.9.6 +pkgver=0.9.7 pkgrel=1 pkgdesc="Rime input method engine for ibus" arch=('i686' 'x86_64') @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('02d87a0b45f0a03a80e7e10d963d8f4c') +md5sums=('7234fd5ed900274f83c418c83ef3a630') diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index b7abd60ec..af4f7df07 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 81483 2012-12-22 10:23:17Z stativ $ +# $Id: PKGBUILD 82378 2013-01-16 10:38:22Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=12.0.1 -_pkgver=123.94 +pkgver=12.0.2 +_pkgver=123.123 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url="http://www.jetbrains.org/" license=('apache') depends=('glibc') source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('0641de81781cfb2f122df3b327a902fb') +md5sums=('64de83782d5b5e0b3f0139cd933b87cd') build() { cd "$srcdir" diff --git a/community/kmscon/PKGBUILD b/community/kmscon/PKGBUILD new file mode 100644 index 000000000..11cb9492d --- /dev/null +++ b/community/kmscon/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer: Daniel Micay <danielmicay@gmail.com> +# Contributor: David Herrmann <dh.herrmann@googlemail.com> +pkgname=kmscon +pkgver=6 +pkgrel=3 +pkgdesc='Terminal emulator based on Kernel Mode Setting (KMS)' +arch=(i686 x86_64) +url='https://github.com/dvdhrm/kmscon' +license=('MIT') +depends=(systemd libdrm mesa libegl libgbm libgles pango libxkbcommon libpciaccess xkeyboard-config) +makedepends=('libxslt' 'docbook-xsl' 'linux-api-headers') +options=(!libtool) +source=(https://github.com/downloads/dvdhrm/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('12f6966cef8e846f31dbcad916a9f347') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure \ + --prefix=/usr \ + --enable-kmscon \ + --disable-wlterm \ + --enable-multi-seat \ + --enable-hotplug \ + --enable-pciaccess \ + --with-video=fbdev,dumb,drm \ + --with-fonts=pango,freetype2,8x16 \ + --with-sessions=dummy,terminal + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + mkdir -p "$pkgdir/usr/share/licenses/$pkgname" "$pkgdir/usr/lib/systemd/system" + cp COPYING "$pkgdir/usr/share/licenses/$pkgname/" + cp docs/kmscon{,@}.service "$pkgdir/usr/lib/systemd/system/" +} diff --git a/community/librime/PKGBUILD b/community/librime/PKGBUILD index 407e5f950..f2e60667b 100644 --- a/community/librime/PKGBUILD +++ b/community/librime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82224 2013-01-12 16:38:20Z fyan $ +# $Id: PKGBUILD 82381 2013-01-16 11:25:08Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: GONG Chen <chen dot sst at gmail dot com> # Contributor: 網軍總司令 pkgname=librime -pkgver=0.9.6 +pkgver=0.9.7 pkgrel=1 pkgdesc="Rime input method engine" arch=('i686' 'x86_64') @@ -25,4 +25,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('3e57ad55bcd82e7c995ad37f52b7d432') +md5sums=('732fe5258ab4fced26e61475cdcffdb1') diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 28612f39e..950896dae 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80156 2012-11-16 23:35:58Z ioni $ +# $Id: PKGBUILD 82411 2013-01-16 23:44:10Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.26.0 -pkgrel=3 +pkgrel=4 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -29,10 +29,12 @@ replaces=('myththemes' 'mythplugins-mythvideo') backup=('etc/conf.d/mythbackend') install='mythtv.install' source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" + 'alsa.patch' 'mythbackend.rc' 'mythbackend.conf' 'mythbackend.service') md5sums=('f57066bf75e6f14824c494d41639f4f9' + 'f64b8219e3d27a2edf96733b851e576b' 'c8f935d42fb8617e9279bd539811ca5f' 'ab962d83614cbd0ac11ce3fcc929829d' 'e4d572dcc307d6d8ae26bee5aebf9f3a') @@ -41,6 +43,8 @@ build() { cd "$srcdir/$pkgname-$pkgver" find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + patch -Np1 -i "$srcdir/alsa.patch" + ARCH="${CARCH/_/-}" ./configure --prefix=/usr \ --cpu="$ARCH" \ diff --git a/community/mythtv/alsa.patch b/community/mythtv/alsa.patch new file mode 100644 index 000000000..07cf1c3a9 --- /dev/null +++ b/community/mythtv/alsa.patch @@ -0,0 +1,66 @@ +diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-common.c b/external/FFmpeg/libavdevice/alsa-audio-common.c +--- a/external/FFmpeg/libavdevice/alsa-audio-common.c 2012-10-02 23:30:24.000000000 +1300 ++++ b/external/FFmpeg/libavdevice/alsa-audio-common.c 2013-01-09 13:23:49.704360811 +1300 +@@ -28,6 +28,7 @@ + * @author Nicolas George ( nicolas george normalesup org ) + */ + ++#include <sys/types.h> + #include <alsa/asoundlib.h> + #include "avdevice.h" + #include "libavutil/avassert.h" +diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-dec.c b/external/FFmpeg/libavdevice/alsa-audio-dec.c +--- a/external/FFmpeg/libavdevice/alsa-audio-dec.c 2012-10-02 23:30:24.000000000 +1300 ++++ b/external/FFmpeg/libavdevice/alsa-audio-dec.c 2013-01-09 13:23:47.911005108 +1300 +@@ -45,6 +45,7 @@ + * plugin. + */ + ++#include <sys/types.h> + #include <alsa/asoundlib.h> + #include "libavformat/internal.h" + #include "libavutil/opt.h" +diff -Nru a/external/FFmpeg/libavdevice/alsa-audio-enc.c b/external/FFmpeg/libavdevice/alsa-audio-enc.c +--- a/external/FFmpeg/libavdevice/alsa-audio-enc.c 2012-10-02 23:30:24.000000000 +1300 ++++ b/external/FFmpeg/libavdevice/alsa-audio-enc.c 2013-01-09 13:23:46.880992286 +1300 +@@ -37,6 +37,7 @@ + * which gives a low latency suitable for real-time playback. + */ + ++#include <sys/types.h> + #include <alsa/asoundlib.h> + + #include "libavformat/internal.h" +diff -Nru a/external/FFmpeg/libavdevice/alsa-audio.h b/external/FFmpeg/libavdevice/alsa-audio.h +--- a/external/FFmpeg/libavdevice/alsa-audio.h 2012-10-02 23:30:24.000000000 +1300 ++++ b/external/FFmpeg/libavdevice/alsa-audio.h 2013-01-09 13:23:51.121045145 +1300 +@@ -30,6 +30,7 @@ + #ifndef AVDEVICE_ALSA_AUDIO_H + #define AVDEVICE_ALSA_AUDIO_H + ++#include <sys/types.h> + #include <alsa/asoundlib.h> + #include "config.h" + #include "libavutil/log.h" +diff -Nru a/libs/libmyth/audio/audiooutputalsa.h b/libs/libmyth/audio/audiooutputalsa.h +--- a/libs/libmyth/audio/audiooutputalsa.h 2012-10-02 23:30:24.000000000 +1300 ++++ b/libs/libmyth/audio/audiooutputalsa.h 2013-01-09 13:22:13.313180438 +1300 +@@ -1,6 +1,7 @@ + #ifndef AUDIOOUTPUTALSA + #define AUDIOOUTPUTALSA + ++#include <sys/types.h> + #define ALSA_PCM_NEW_HW_PARAMS_API + #define ALSA_PCM_NEW_SW_PARAMS_API + #include <alsa/asoundlib.h> +diff -Nru a/libs/libmythtv/audioinputalsa.h b/libs/libmythtv/audioinputalsa.h +--- a/libs/libmythtv/audioinputalsa.h 2012-10-02 23:30:24.000000000 +1300 ++++ b/libs/libmythtv/audioinputalsa.h 2013-01-09 13:22:44.470223553 +1300 +@@ -24,6 +24,7 @@ + #include "audioinput.h" + + #ifdef USING_ALSA ++#include <sys/types.h> + #include <alsa/asoundlib.h> + #else + typedef int snd_pcm_t; diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD index 4b333fa1c..8f252301f 100644 --- a/community/warzone2100/PKGBUILD +++ b/community/warzone2100/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 77666 2012-10-13 11:45:54Z allan $ +# $Id: PKGBUILD 82377 2013-01-16 10:35:35Z lcarlier $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Angelo Theodorou <encelo@users.sourceforge.net> pkgname=warzone2100 -pkgver=2.3.9 -pkgrel=3 +pkgver=3.1.0 +pkgrel=1 pkgdesc="3D realtime strategy game on a future Earth" url="http://wz2100.net/" arch=('i686' 'x86_64') license=('GPL') -depends=('sdl' 'openal' 'libpng' 'libvorbis' 'libtheora' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu') -makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip' 'asciidoc') -source=(#"http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz" - "http://downloads.sourceforge.net/project/warzone2100/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('7185090a089c9c0e0eca7535a8f25dca') +depends=('sdl' 'glew' 'fribidi' 'openal' 'libvorbis' 'libtheora' 'physfs' 'ttf-dejavu' 'qt') +makedepends=('gawk' 'flex' 'zip' 'unzip' 'asciidoc' 'mesa') +source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.xz") +md5sums=('7f061f3e5a2a6a83c146508ccefabd86') build() { cd ${pkgname}-${pkgver} diff --git a/community/xmms-imms/PKGBUILD b/community/xmms-imms/PKGBUILD index 9ff793010..e6dc930f7 100644 --- a/community/xmms-imms/PKGBUILD +++ b/community/xmms-imms/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 64367 2012-02-11 23:25:01Z allan $ +# $Id: PKGBUILD 82400 2013-01-16 15:53:22Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Kritoke <kritoke@nospam.gmail.com> # Contributor: Kritoke <kritoke@nospam.gmail.com> pkgname=xmms-imms -pkgver=3.1.0_rc8 -pkgrel=3 +pkgver=3.1.0_rc10 +pkgrel=1 pkgdesc="An intelligent playlist plug-in for XMMS that tracks your listening patterns and dynamically adapts to your taste." arch=(i686 x86_64) license=("GPL") url="http://imms.luminal.org/" -depends=('xmms' 'pcre' 'sqlite3' 'taglib' 'glib2' 'sox' 'torch' 'libxss' 'fftw') +depends=('xmms' 'pcre' 'sqlite' 'taglib' 'glib2' 'sox' 'torch' 'libxss' 'fftw') replaces=('imms') source=(http://imms.googlecode.com/files/imms-${pkgver/_/-}.tar.bz2) -md5sums=('31b77cbc2dba334b039c5618bbbf203e') +md5sums=('61302249e9638779b3241987ab62676d') build() { cd $srcdir/imms-${pkgver/_/-} @@ -22,11 +22,11 @@ build() { autoheader aclocal autoconf - ./configure --prefix=/usr --disable-immsremote + CXXFLAGS="$CXXFLAGS -DDEBUG=0" ./configure --prefix=/usr --disable-immsremote fi - make || return 1 + make mkdir -p $pkgdir/usr/bin make prefix=$pkgdir/usr DESTDIR=$startdir/pkg/usr/lib/xmms/General \ - BMPDESTDIR=$pkgdir/usr/lib/bmp/General install || return 1 + BMPDESTDIR=$pkgdir/usr/lib/bmp/General install } diff --git a/extra/baobab/PKGBUILD b/extra/baobab/PKGBUILD index 01a39bed9..f9d035aa2 100644 --- a/extra/baobab/PKGBUILD +++ b/extra/baobab/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 171029 2012-11-15 14:16:00Z heftig $ +# $Id: PKGBUILD 175196 2013-01-16 11:12:55Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=baobab -pkgver=3.6.3 +pkgver=3.6.4 pkgrel=1 pkgdesc="A graphical directory tree analyzer" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection') groups=('gnome-extra') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('24ec516b12da234f1bd7bff3ccb2be9a46dff0b1fb0fa6cd79ff50549a295eb1') +sha256sums=('e5539558ef3411e14cb165a3e77f2d0451e984722a71a7a7d0f72fe29360cb2e') build() { cd "$pkgname-$pkgver" diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index f560cd9a9..1d0160666 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 174012 2013-01-01 13:02:26Z bisson $ +# $Id: PKGBUILD 175213 2013-01-16 21:13:09Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> @@ -6,7 +6,7 @@ pkgname=feh pkgver=2.8 -pkgrel=1 +pkgrel=2 pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' license=('custom:MIT') @@ -20,7 +20,7 @@ sha1sums=('eeb251d5971cf07e632661ef0b514fc3b0c7aca6') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX=/usr exif=1 help=1 + make PREFIX=/usr exif=1 help=1 stat64=1 } package() { diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD index 5f054d372..ab3dad32d 100644 --- a/extra/fontconfig/PKGBUILD +++ b/extra/fontconfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172072 2012-11-27 15:23:20Z andyrtr $ +# $Id: PKGBUILD 175209 2013-01-16 17:39:36Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=fontconfig pkgver=2.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64) url="http://www.fontconfig.org/release/" @@ -21,7 +21,7 @@ build() { # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well libtoolize -f - autoreconf -f + autoreconf -fi ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD index f197877e3..2d19242a4 100644 --- a/extra/gnome-color-manager/PKGBUILD +++ b/extra/gnome-color-manager/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 169889 2012-10-30 22:33:42Z heftig $ +# $Id: PKGBUILD 175200 2013-01-16 13:44:28Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-color-manager -pkgver=3.6.0 +pkgver=3.6.1 pkgrel=1 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' 'colord-gtk') + 'mash' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop' 'colord-gtk' 'libexif') makedepends=('intltool' 'yelp-tools') 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=('c4e9d63c53061c65c4d1bcdd14952dd01aed7332c2e36d34f4a243a9e5097ec9') +sha256sums=('c5fb0903d5570c50fbb2347db2222314bef0c57b293302e48e0b73f57f426fb7') build(){ cd $pkgname-$pkgver diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD index 68d7dcbd4..09763771a 100644 --- a/extra/gnome-menus/PKGBUILD +++ b/extra/gnome-menus/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 170973 2012-11-14 07:13:15Z heftig $ +# $Id: PKGBUILD 175187 2013-01-16 10:52:05Z jgc $ # Maintainer: Jan de Groot <jan@archlinux.org> pkgname=gnome-menus -pkgver=3.6.1 +pkgver=3.6.2 pkgrel=1 pkgdesc="GNOME menu specifications" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ 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=('1615f6852280a161cd137d5b8b59f35519a3a7ba89738f55c578325b0512043e' +sha256sums=('f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f' 'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc') build() { diff --git a/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch index 03b662c86..eb77bada2 100644 --- a/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch +++ b/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch @@ -1412,9 +1412,9 @@ index 1c594d8..bb7224c 100644 g_signal_connect (manager->priv->up_client, "device-added", G_CALLBACK (engine_device_added_cb), manager); @@ -3895,6 +4119,9 @@ gsd_power_manager_start (GsdPowerManager *manager, - manager->priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error); - if (manager->priv->x11_screen == NULL) - return FALSE; + G_CALLBACK (idle_idletime_reset_cb), manager); + g_signal_connect (manager->priv->idletime, "alarm-expired", + G_CALLBACK (idle_idletime_alarm_expired_cb), manager); + g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager); + /* set up initial state */ + on_randr_event (manager->priv->x11_screen, manager); diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index 570ae3ef4..c3b7a87e5 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170991 2012-11-14 14:29:35Z ibiru $ +# $Id: PKGBUILD 175198 2013-01-16 13:36:50Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-settings-daemon -pkgver=3.6.3 -pkgrel=2 +pkgver=3.6.4 +pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') license=('GPL') @@ -16,8 +16,8 @@ url="http://www.gnome.org" groups=('gnome') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch) -sha256sums=('606aaaba9cc7f51035702aead46c8bb595917a09cb947b396a579ea443328cdc' - 'c4aab9b45346fbae18808358346208f989cce8bf9c9eb753e2af7eca73715109') +sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15' + '5572b5b3f554ce361353a8db42c26a8f789606f65acc5943a286271603fcb8eb') build() { cd $pkgname-$pkgver @@ -25,8 +25,10 @@ build() { # logind key handling FS#31801, patch from Fedora # rebased onto screensaver.patch patch -Np1 -i ../0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch + aclocal - automake + autoconf + automake --add-missing ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \ diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD index d4ca23853..fb3e507d9 100644 --- a/extra/gtkhtml4/PKGBUILD +++ b/extra/gtkhtml4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170809 2012-11-12 02:14:23Z heftig $ +# $Id: PKGBUILD 175194 2013-01-16 11:05:56Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtkhtml4 _pkgbasename=gtkhtml -pkgver=4.6.1 +pkgver=4.6.2 pkgrel=1 pkgdesc="A lightweight HTML renderer/editor widget for GTK3" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('intltool') url="http://www.gnome.org" options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('36670a268f3fd437ddb8c4e7f127d6fb0c09a6fe23a431bede0fc3213c75db98') +sha256sums=('d0578892a5755f3ab661f0312d1a1376f4926afe72e65d83b6890011bc1f9fd7') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD index 9b11973d5..5331e37b5 100644 --- a/extra/libsoup/PKGBUILD +++ b/extra/libsoup/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170892 2012-11-12 22:13:35Z heftig $ +# $Id: PKGBUILD 175189 2013-01-16 10:55:26Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=libsoup pkgname=('libsoup' 'libsoup-gnome') -pkgver=2.40.2 +pkgver=2.40.3 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') @@ -11,7 +11,7 @@ makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-i url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('32e81220f53abb1f5bbe7d8b0717119df70667fc48e2342d82209ed1593e71dc') +sha256sums=('82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9') build() { cd "$pkgbase-$pkgver" diff --git a/extra/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD index 2b1544b9f..1ced5dcc4 100644 --- a/extra/xf86-input-joystick/PKGBUILD +++ b/extra/xf86-input-joystick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173112 2012-12-11 10:08:00Z jgc $ +# $Id: PKGBUILD 175202 2013-01-16 16:15:44Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-joystick -pkgver=1.6.1 -pkgrel=3 +pkgver=1.6.2 +pkgrel=1 pkgdesc="X.Org Joystick input driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -16,7 +16,7 @@ groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 50-joystick.conf) -sha1sums=('0712652ec6cdb2fca6ad888548b232a4de9cf580' +sha1sums=('61658b8d829fdaed6064c7c26232c3884d359187' 'e1ff3699a0470c6bb78a53f718df9d8521621e11') build() { diff --git a/extra/xf86-input-vmmouse/PKGBUILD b/extra/xf86-input-vmmouse/PKGBUILD index f55f8d22c..009a20aba 100644 --- a/extra/xf86-input-vmmouse/PKGBUILD +++ b/extra/xf86-input-vmmouse/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168561 2012-10-13 11:43:53Z andyrtr $ +# $Id: PKGBUILD 175179 2013-01-16 09:55:26Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-vmmouse -pkgver=12.9.0 -pkgrel=2 +pkgver=13.0.0 +pkgrel=1 pkgdesc="X.org VMWare Mouse input driver" arch=(i686 x86_64) license=('custom') @@ -15,7 +15,7 @@ groups=('xorg-drivers' 'xorg') backup=('etc/X11/xorg.conf.d/50-vmmouse.conf') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('83500beddba2da390389705d482131872fe9be8b') +sha256sums=('04cfb60366008d4db815c550d8fb8d0a4270c75fa7a20fa3bddc9ecbd355612c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD index fe5546265..47905d4e6 100644 --- a/extra/xf86-video-vmware/PKGBUILD +++ b/extra/xf86-video-vmware/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168595 2012-10-13 11:46:27Z andyrtr $ +# $Id: PKGBUILD 175177 2013-01-16 09:39:57Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-vmware -pkgver=12.0.2 -pkgrel=2 +pkgver=13.0.0 +pkgrel=1 pkgdesc="X.org vmware video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -13,13 +13,11 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'sc conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') groups=('xorg-drivers' 'xorg') options=('!libtool' '!emptydirs') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff) -sha1sums=('efa47f365d88da245804a9934719ff860ed04f95' - 'ad475b37e2614f365533a40da0fb5b9e2709e3c6') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/git_fixes.diff ./configure --prefix=/usr --enable-vmwarectrl-client make } diff --git a/extra/xorg-bdftopcf/PKGBUILD b/extra/xorg-bdftopcf/PKGBUILD index af1cc4e0c..8bef25d11 100644 --- a/extra/xorg-bdftopcf/PKGBUILD +++ b/extra/xorg-bdftopcf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150979 2012-02-24 12:29:18Z allan $ +# $Id: PKGBUILD 175183 2013-01-16 10:19:35Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-bdftopcf -pkgver=1.0.3 -pkgrel=2 +pkgver=1.0.4 +pkgrel=1 pkgdesc="Convert X font from Bitmap Distribution Format to Portable Compiled Format" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libxfont') makedepends=('xorg-util-macros' 'xproto') groups=('xorg' 'xorg-apps') source=(http://xorg.freedesktop.org/archive/individual/app/bdftopcf-${pkgver}.tar.bz2) -sha1sums=('146b4ece2867479045c3b4593b22c9f1d21da14a') +sha256sums=('eaf59057ba3d7cffe29526562ce50868da7da823487a4cfb3e16946e5ffd2798') build() { cd "${srcdir}/bdftopcf-${pkgver}" diff --git a/extra/xorg-xcalc/PKGBUILD b/extra/xorg-xcalc/PKGBUILD index 13bdb8ae4..7d949a313 100644 --- a/extra/xorg-xcalc/PKGBUILD +++ b/extra/xorg-xcalc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151172 2012-02-25 06:55:40Z allan $ +# $Id: PKGBUILD 175181 2013-01-16 10:11:05Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xcalc -pkgver=1.0.4.1 -pkgrel=2 +pkgver=1.0.5 +pkgrel=1 pkgdesc="Scientific calculator for X" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -11,7 +11,7 @@ license=('custom') depends=('libxaw') makedepends=('xorg-util-macros') source=(http://xorg.freedesktop.org/archive/individual/app/xcalc-${pkgver}.tar.bz2) -sha1sums=('2206fc4bf3719c43fa13a6c64a37b40607d8e5e2') +sha256sums=('448f3aca106e86fbc051172cc4ea51eebce2fac096a7a971b8561b9b85697ae4') build() { cd "${srcdir}/xcalc-${pkgver}" diff --git a/extra/xorg-xvidtune/PKGBUILD b/extra/xorg-xvidtune/PKGBUILD index 288dc084c..5cf0c2b81 100644 --- a/extra/xorg-xvidtune/PKGBUILD +++ b/extra/xorg-xvidtune/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xvidtune -pkgver=1.0.2 -pkgrel=2 +pkgver=1.0.3 +pkgrel=1 pkgdesc="Video mode tuner for Xorg" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -11,7 +11,7 @@ license=('custom') depends=('libxxf86vm' 'libxt' 'libxaw' 'libxmu' 'libx11') makedepends=('xorg-util-macros') source=("http://xorg.freedesktop.org/archive/individual/app/xvidtune-${pkgver}.tar.bz2") -sha1sums=('2f3f821943018c07efd4547afa4313ac92718b1e') +sha256sums=('24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01') build() { cd "${srcdir}/xvidtune-${pkgver}" diff --git a/libre/icecat-l10n/Makefile b/libre/icecat-l10n/Makefile new file mode 100644 index 000000000..d1aaf7bff --- /dev/null +++ b/libre/icecat-l10n/Makefile @@ -0,0 +1,38 @@ +#!/usr/bin/make -f +# Use this script to update the PKGBUILD's list of langpacks. +# This script depends on: +# - coreutils +# - grep +# - pacman +# - sed +# - wget + +# Variables: +_pkgver=10.0 +pkgver=10.0 +pkgrel=1 + +# Guts: ############################################################## + +default: PHONY all +all: PHONY PKGBUILD + +index.html: Makefile + rm -f $@ + wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/ +langpacks.txt: index.html Makefile + egrep -o '[^>".]+\.xpi' $< | sort -u | sed 's/\.xpi//' > $@ +PKGBUILD: PKGBUILD.in langpacks.txt Makefile + sed \ + -e 's/@_PKGVER@/$(_pkgver)/' \ + -e 's/@PKGVER@/$(pkgver)/' \ + -e 's/@PKGREL@/$(pkgrel)/' \ + -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \ + -e '/md5sums/,$$d' \ + PKGBUILD.in > $@ + makepkg -dg >> $@ + +clean: PHONY + rm -f index.html langpacks.txt *.xpi + +.PHONY: PHONY FORCE diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD new file mode 100644 index 000000000..7ee93cf06 --- /dev/null +++ b/libre/icecat-l10n/PKGBUILD @@ -0,0 +1,260 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: fauno <fauno@kiwwwi.com.ar> +# Contributor: Figue <ffigue@gmail.com> +# Maintainer : Márcio Silva <coadde@lavabit.com> +# Maintainer : André Silva <emulatorman@lavabit.com> + +# Based on firefox-i18n package + +# 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. + +_langpacks=( + ach + ak + ar + as + ast + be + bg + bn-BD + bn-IN + br + bs + ca + cs + csb + cy + da + de + el + en-GB + en-US + en-ZA + eo + es-AR + es-CL + es-ES + es-MX + et + eu + fa + ff + fi + fr + fy-NL + ga-IE + gd + gl + gu-IN + he + hi-IN + hr + hu + hy-AM + id + is + it + ja + kk + km + kn + ko + ku + lg + lij + 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-LK + ta + te + th + tr + uk + vi + zh-CN + zh-TW + zu +) + +pkgbase=icecat-l10n +pkgname=( + $(for lang in ${_langpacks[@]} + do echo icecat-l10n-$lang | tr A-Z a-z + done) +) +pkgver=17.0.1 +pkgrel=1 +pkgdesc='Language packs for GNUzilla IceCat.' +arch=( + any +) +license=( + MPL +) +url=http://www.gnu.org/software/gnuzilla/ +depends=( + ${pkgbase%-l10n}=$pkgver +) +makedepends=( + unzip + zip +) +source=('region.properties') + for lang in ${_langpacks[@]} + do + source+=(http://ftp.gnu.org/gnu/gnuzilla/lang/${pkgver::4}/$lang.xpi) + done + +noextract=( + $(for lang in ${_langpacks[@]} + do echo $lang.xpi + done) +) + + +_path=/usr/lib/${pkgbase%-l10n}/extensions/ + +build() { + cd $srcdir + + for i in ${_langpacks[@]} + do + cd $srcdir + unzip -q $i.xpi -d $i + install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region + cd $i + zip -q -r $srcdir/langpack-$i@firefox.mozilla.org.xpi . + done + + cd $srcdir +} + +for lang in ${_langpacks[@]} +do + eval " +package_icecat-l10n-$(echo $lang | tr A-Z a-z) () { + replaces=(icecat-i18n-$(echo $lang | tr A-Z a-z)) + conflicts=(icecat-i18n-$(echo $lang | tr A-Z a-z)) + provides=(icecat-i18n-$(echo $lang | tr A-Z a-z)) + install -Dm644 \"\$srcdir/langpack-$lang@firefox.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@firefox.mozilla.org.xpi\" +} +" +done + +sha512sums=( + 20064992e694b3fed0f75bee9d54af3427c01ae0048e0ec220895e58127954ceb4db47ea85627e86d9ea6614ce3feaf30f652d87f7c2e896fc00774a757a640a + f3c627282fa78ef67335fa70671af848f2fff2252db1c4125838bcbfd92c61ae978b9a32885f4b33beac4eb4d8dc3fc034b18703686164a4903c4180de539439 + d88793ed54794833ec6200d7a1957b68ebe8dd5c1dd6f4d030440919e5ca7f85f84fefd459603d29be57fd6b9d0961356c7760aedaca638bc3b58532ceae8441 + 6f3f6e026bc7d4ac6d6aa9e1ebb5995d663293f9b26190d33de8857cbfd5e6454bbda49bd13d6c6c1dab544ef0f2da0cdec50b1d9fbfb73aa5d66b0a6a67a87c + a0f8aec338bd7a36af983bab144fafdb9c9dc9081ceaf31aae443160e68758f3d46a385bc20d4a6767b81d09eeca92e08e0aa79250719e9e1f9d7bbab8137390 + 066d2540fcf97e87e778124d9bd8aa0d624d810d5b034423f43fc77f8579c2006c2a7a519b438a152272ed9db85a3e56ae770f221c7eabdc700368c4788e6108 + 12801164ecebf059c5615480785ce4ce95de5221d05e74bf85f747a62f8954decd372afb829b8d941316bc9115c3b6faf1da6da869d0ce5b09c622043936bf6f + aacf7f3713431a4dd5060d475145834c0b9aafb032bdceac9bfee4d3ea0ebe869c86bfec1fb65995b2a531962c40b9df69d4a427e81cf01164891f668c3000ee + ce022ddcb8c46d1ecc97187ad025707b33f763b1abed69a8cc33b1b512728267fe67ab45dd19e5f89463328950330db9ea5243df30e0f35acae48c4746211b79 + 560c43e6f684a726c10a547b6f95d511d63837521b6251ab3b5f141c4e9490c925eb049e3c6e29d1eb9bbe066fda9e5671a0aae8715f0946ee941ece77b5968a + 5bd37933a9026c5af0facb34932a1cbb24b46d16fee9ee2b94313e3c7c6622d5ac0f1afe05b003a39cd9750cfa4f0d1f40455610b52d4c48f1e3ff108c2bdca8 + 37c5d9048f8ef0969a71bf422f9625fa768fac0174046f8cc5922534070eb38a89e467e78013c394702afe4af9045d3977d250bbe0dc26ce5059d5f4c8bce990 + aaf2b4a0d7a8a9b9d29a212be5c7de43af47b80624e6f2ffc6fd1be80de3840acdb7dc91309bd59a0e1e8c8f510f2ce571d0be5587dcbb55caed32b0c400be5d + 5db08621ddb5313c2e87e6f0922b66716cd1880eb479ca23ef6dbfcd52c86af2e6954dfb68569aef31061fe4ef0965111fab91f36caa12e01f76749bac0ae625 + 9acf3446c15e95f7f8bd553ce1860fc9d8181eb20472e3e435544ccea96d2305698cf89af4b4bce8a741c1c13f5b590f73912a3ff478fe976a7da02046877a6e + 0f3cf93dc93f324b5caa4da8fba259164bb6bd58bdd1dc4152304a4000ef84b6191e827fa69a619a32c8edcdd3c66d2307100f6db5e934182862fd53e382ebc2 + 31b7185f3587e3f8cd660510908392e97cd664364fb4e1c538f30fc53012ae2703a4c2542b956099feccecc28d849953cc0259c76ea8b13cac8e2ae4a66091b6 + 5c195f9572eb9134d2616be85b4101ad3b5ca7f2314a061208238e8c22a3dfa4173da8aaae5923875776bc782b0e84c8ca1633e701b16a6a6f0847e99c28a1a6 + b0825885c0dc76dd2aacf86bb662d6db400d76247c7071b2920f3c0543e6bea6c4d9752aa42abeb02b25195160eb727dce949be2dbd6493b5e4de6afb738f227 + 2e27aebb49e6c4ca3360dd53e240ac03e307442a26690c37e09e185a02531a13077181417bbf64580062820d67cbc5a8d87d297accb2410c85a00655bb74a359 + e77b3060eddda40956dd6cebc56d2c754e9f9132afe346cbaba4b9f0df33b799c357a61d65cd8d469ae52df1419fbe31e35226c342a43ebbdd1ca09913d733fb + 5deefc36b86a2bb20804a506df208d5ef87675dcc82b3f2faaa39ca08eb5ae2793a15aff61da7328234f75c67c3aff3c5a56e5cdabcc5e6b7c2225405b9967e1 + 7216d29fb344b7e1ad373cb41f3926a52e6fb7a3ba1313c3b9918ca7e8001d7b285d40d1ca0d06cf38cc29f8d16aabd28dbbdd7cb4270eff4a5357a60bcada11 + ffbe8caf8b7c38dfe760d7007f9da9cff78c59814572a2bc3f3dbe41b00abae91d1aae54661e19ec5c836b13ae752bdbbda09691485e6f7546335435207f0c51 + 9213b4b91a1849bc1d659bfe97d78ac936204a7b68aaa4294840867950f59276a792b00f278ea2bf078b80ee187a26d1ad94be34beb609f0f321fa102b5c8902 + 4d4c267991aba194aef7fbcba6e4212e095aaf99b7b21255dc3faf770685effb7284eb75d6dec41be685f694736f101a15e7c6a09c877444c73b0c9ecf523a01 + cf9e06f616d181894f6731587e917fa7b12f2dd89bd388dbfc3ee263595239908be36dc076b448932bd27a58f5fc95c5b8f39d53c0b487973976f036a660e9c3 + 504778df4dc2b19afe617ce506eefc6440931fcaa3f1637f1bbaa43fcc5b1f480d3e5223a3b0a3570dc73b08d6c2b77474b65b90ce9e706d4114431d53293a9e + 92361116e3faaa39a93ca33e190a3ffb40eefe028ad30feaf2cd62517a4337af74bfebd00a7e0f8ee3dfc9e1b6d9fb69d26c360e4c80edc193c7bcbcbabd86f2 + 3a7ff8e5213d88727ea15fb63ebdbb6c1c53da18b203895f4ec4b4d42b8ce163eeba94c2cbe68407fabbd1290048c75ce8fac91d379d11e5357b0a0908e2da86 + 6db783b5581ebfddea5d3e27e0ac081f216252711a9ad1f0c88a78ca79bd7c0a76e21b28aec745052cd210e6282670824640b67016822cc312a508052347453b + d6cad457fbe801e0469dad7760f3dc434b09ae44f703d60e96dbe8882a9fce001d5ebfb5b86154eaddc898c57bd36ce540be5505f9dd67872ecdcf5a378bddbb + 08a4893fb4cc059ddf4407e5989a21cd47efc4cbb49248b92638d39a5833f7a61c22d38a3c63a744417342f2a1cfe42615202bc19f4aa10c31e6efc3e757fa7c + 610cca4845f8f7a8e4a5401a5247677d953d60ba9d936fde6d796f59ce545c103a229ff15c5511041fa7b6883ed622b5a0576f92bee9b668982bda191a748f12 + 5228910ca879655c32ccd6e87ebcaceaff34f370517f6f4dc02f9d34a724d0243a0a4512549bab3f6c9da296c527e73f30274f57fb35187aa76475166137e9f4 + be389439dff009413c5bac5bc2a9b3ec98aafb9ed5be2c1429d8a528f9dcf9906f33f2f695d70f84e9940312a7e06c90bc9f8071ecb2bdd697bd7d6e7d69cc31 + 4d0fa955007c5ed6b3ab45da487bc569e0ee7e50d270ead3dea69e8e98b4f8fc105dc1e5876c2c1d35c1f5be97a48f013af3893214ecd1ac75f8c50d6db12446 + 4b2cb88b781c320b1230d65b41dcfbdb7120e2fc3acb30e679f7c143cacc293e07bf5d4e1c32910e9dd5952b17a8fb24d312a12553e7d7b99636c40d26d004ea + 2ea6935fb9b9f24f901f34f6ad9982c8f523247992244b2f2cbc82a4558e73e9a401a6ceaa0b7d49b1b96c52ff145c1698d8e032bc5ecd81c313c7fc5d299224 + d73c522a334c79ec68f5d3609d04585c0796d257435c9ae2ac19c5bca57c153b8fc45c045ab3fb3c26b2110eb9e1fd169edd6c67d6762a30b13b7bbe8bc00d79 + 709f86b5bae1a2d20ea78a35b84c4b60825090769bb0797c4958362d4c593e796a651801f3f52e2e8eb74f541945ad216f4f91ed633ed0d714fa4b13c88ab11f + 0d6b27fcb5d9bf936215a4736877a605dd7279c9c3e4a30dd359acb373cc8413130855393e00e44f2465da980c5e18003f8b9c383e4fe24550234b06830e92e4 + aec647729bff73a8f4a645d5a058ac65d106346023535197c13042e832f40f3e7c716b6c0f5ffc5071efe8a70138db5cf1edd36ab871d2b4d62729c151485d17 + 66fff3d844cf19dd606c87b21d61ca5b708693177e2e07b7496443b046c689db3670796f9979eb8e1705562f7912c9b0b55e588e5487184af88bbb4576db1dd6 + 02edefb82f8c80050bea8c34244b9475c56ee27331afa3660cb1c287b5e458bc497803fb0551f349490f8306a9484714d3e37202b65bae69b6193db3a338f39b + 374015d62bd5e739438bd4d6946991448b545719be2b577e70efd1bae44d80ae05f164b234ba7dbc9908645d8d09882b51bd4576e2b787a1738e1da1c8da37c7 + b7a9f867c1fa8d6867f23bdbc3cce2bc5de5524ed62197af58c64de79ada49daad7395c54795d588fdf48ea390c065c2648aa5f745072b58b16d8381e0c2c4fb + 02113a07a1b326b961f3ffddbe8e5be7504d6d653ae5a9e1a0391c2f6f047cd59e783e257db717b6d31191b6c0516db61b3e729d9710b594d6cdd0a9cc396365 + 86840368f447eeb82ada6194ccab18cba8a293fa4803303041bff22d8639bba0099a1bdf93dd7b027ab91c675a42c02ccf6ba299986f1aa5f62b3fc5a6cc8745 + 16c08ab4088c44b3b09dd021c19669156da99e7a578bb91543ccd9a4d60a3a5d66d57b75f23b4c26c40924a2c52f9a73d02b61db1aae039701c3b881575265f3 + e3c33cffe8e88bde6b6a1108de40809b2dc6ee8d9b861fed38d98389410d65856f84b8e225695283e8d53570147a2d12bfc9875a527b9e2f383249091712f5ea + 29dfcc4f4eb455eab8eee90ee1fda258fb24b0679d73ac6b63085e48795c7218ac941e73c9dd691105e63907f8b5cd6aa067628d45b6d4a8c19e829f1ef28ca2 + ced0dbdfd1f5685811c8984b8eaab67698eeec134d34852b8e64f62e426ddac5c0c2d6130ec14d4c0d374d5333b5376aefa256befc98bee77daff64fd7d0ecaf + c49242218db2c982182ead1ce91b72ad8e315a1dff8a327185cb2718eb27cd5381b9801e9bd287cf82a191d5618e434491246404a9801da95d37e0702730771e + 44fdd428b0eaab6a6c879c940fd499d49a184b6e11fe73eb23534a7f6e069d7535c43b6364e17398e75b8fa420edb50efb2cd9e6321759171ad944d37c4297be + 2f02da6626bb6f2b39c33ba761048a3219b11a7a1e0012e28e6b99eda194a12e467443716a5f3e3590d764cf96912d782fa2013f18c15df0694d58c380dfb665 + 9223386933582dbff20c40f84f6a7c60d86f3015de7a66f2119a616dc8a1ea1f148d7b726167dac72fed4742ff0d9ebe02660e99d22fceb59d557e718c35b3c9 + 1af17d2d25db68d4876f25e4d624d28f7ee83517fd3e8aa1e404b4eba82b8e6c9fe25ecf62593c737260ea969089c9be9ac111cdca45a8f32a10d88c4d76dd01 + e8735e914db6707014a9e23cbde156862f113f9d6c83f1480b34235830e73dc1efddfba3c8eb692d3ec081de7c07bda6d467203498b4301a22c440a71094df4c + ac7ed3ecea34d585d1d66e00f84d946f676aadc5987596f324a51f72a55253c665577ff88f7d197640d33c721331e60b721c386018e87cdbc287461f74b5e3aa + ca8bf664228145b559e7032f225f585cc8cd606c53d81dee79f748e6197a42c58f0587a1d21ba282cccd4836b336d92efabfde8e523f4ef3298d40a0bb7c95cb + f40dcdbc6fd7bddac1a216af6796fae520a799863d559f57aecc2c6fae880ff8cdb6630ffc6672cd54c270b1a2e246d98b352437a752910199938b4a0ba38c0a + 92e4a6140e0079dfd6f733a203e802174958829b40d46c5117c46fa9d278ae2acb5a51103486557b7ca09dcc3c432150b98963c8f4522d4cf75ecba7ae481eca + 9a8f364eaa8fbaa241867bd85677b0258d39cefadbdce9bc09a34420392dfa7f1feceb56558a11666b7e9136dc420881c21705acc793bb98d2dc7858902c3e1c + edef438984bda3cfb48a5bb33e00613465c9eb51308eb2b77809d09d40fc9fd606e1f41fb5acb6381991e51d42d789efd278e3c7dfdeae03418700c4501af1b5 + a21dc8a5c0bf621be61a612fad44d02bdda488e3eea528f54cf799430926d3ce3caff36b7a7ce5ae622ab4c8b5a1d93420ae01b646feeb41995dd0e6f6f1cda1 + 2f0d5222de35c08bc9197e8c89b1b0052164284207e390abaf436744badb77a3afa0832342649bcb4b94372a60f6deffae97fc486e4a84916e4a4630dd22b7e7 + 10b76868670c74b8a761189c410f1c174dd85b4f76b00aa7bdd497959dc4f584f2f6c5736cfb17f08ed8e6e27db6f82a206badc58653ecc7f765e2a27771651a + f4d1de91f617b2b72eb251b700bc54cf101d31a6b7c28cbf8f69f5f409e0e9b25b1aa1e1e349002a5af899edf28c6d36a16000de41f57f2a1fddd2d1ae45fb91 + bf6a9f5e7360d9b79f03ce79734d9814167d96443c59eec479deba6fb7cb78beff323873c166ec99f1256d3768c1740b37d1cb5c531a2eadbe5eb9988925ad4e + e7157b16a6f5524ce1637d5f7e0136949f0cbcb4eec53264863a91388750a202548df27abf5b64a63697c12161e832fc3f1e8ffb4d06b05e22e131d06bb2c579 + 66fd746eb5e2b0ebd05d3d0c645498d149217927ef058da118e558a22bdc1f5e8e3edcbb0dba92dfc2a6443eea25a1ca35a41d1535172dd00d140de9f9976944 + 738a5529a9b6a386f8fa49f2a08b17d63589eee3d3384644988f384dfa758963afc93b019fe0811997464531b23f7351b22ff39b9087e5c173b324174c70f5c5 + f3e1825879a37d561aa9c460b4b405225048f20b782a14ead6287eb62cd273ea72aee046d50e34c3af43e59bcf9449e801399a41fd8f42dde05c48c419971ff3 + e26985e1443beb7f403a0cd68b1b751cfbfc66a4e467d50f69a1aaa39179b71291a421ae28d7e13c5d38a9606db63adcb256e1ff9529cdd53cb25d0bf2826384 + 27cc10d779d20d526b98bcb3cf6b7e355735f29ba2ab67579919989067a816e7aa6668f9f995f04e7da3f0e14f0e3a7f9bcb74e4e321cfddd83c947a7ba8c882 + 81462218ca3e24ad703435fbc762041dc3060719d4846d1264a678ef4bfb29dc88ba6fd80da6352942dd24a8c466f731b5fb42bea04b3a07af29f2bdd1e0a265 + 2e3a4b33fcdc65f6b9482ee0f8dd4baa7b3323634725df3414ab2273dcc71e0b004d0a5fd24019873d23af39687354f60d1cb2255dd74307eec4f356ed84ec91 + 187871334a815b1084ad3ff0ba328ded8573a987878cb22d8546e181fa9ebc683288a352389ce4c7fd715537c400f877488570e3c3a6e7232b77ca94aeec5546 + cf33b1f63013d1fabba6868178f77075340fa946a03f0d936ec1fdfdfdfb58a4c59d21e2b8a8a0663306d05747220e951f17d5526ef6acd872e70c7c4084c18e + c18524862e76289187aa5e541ec11b3632ecf410c247d99aa6e29f73b5038b32e96ac8a6b8ac45671220ecff5c1d7837570dac4e65337e8e18b0e0938b6b8dfb + 23ac9a28661a9befff8410b15cd1a1d935ab0325f0f7c96ac363e8561c0142d9fb912bcaf75b6983fb3c705160ec2eaa44c3f19bd950bcd25c4d9e94f3f707ba + bacabefa1703d0444087e86aff908ac4768a4c07ebdc51fc0f80b417850001bf90561473f316a1d2de6e4a68c92f59876218bf29fcacd84da793a90dcfeb5482 + 7edbfde7bd76cf23c68520b0fef9de128c5dee9a19d3adc291aea0695754470368dade75092a5d476a4ca18ce907efac0f3d567b62b1b65c6711f013c5ecb6de + 04b2e1f09af6983905aaf8538333e4f42d4df856e2c9e6aa14c728ee2d6336f567734129e9a5aca1818f778d3ac81a2d5f0e0129024a77644f9a4318bc59e8a7 + 9d24a29788491eca45b893210e53eecb5eef326e8c9e9d0bc72a29dc2e9a9a369ee910759bf49f50d8d592a6bcf667ab325aa6523628e4358b1543cad5b81c5b + 9f2c1975b5bfbad8348de2d64f453828b6e38747ecd172a902093cbad8846d96b0d43368b28437ec96516517e8091e60564dd9e264218a4e9e6add83672692b4 + 32d9b993a5453fcb2ee64d853fdde16ddcb1589a393e56dec3de03481bc19f67e2c73d76bcbfea26864d90dd127091aaa8e278f114b8a0026ee59662a3fce83d + fdf828e81d039bb35d497aff8a1770beafb91f3a9c53ecbbb6fda672b989648731640a876f7f134fb0956c65129b1923712d363d42f08a54288f0c75bfc57dff +) diff --git a/libre/icecat-l10n/region.properties b/libre/icecat-l10n/region.properties new file mode 100644 index 000000000..4399d8db7 --- /dev/null +++ b/libre/icecat-l10n/region.properties @@ -0,0 +1,32 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# Default search engine +browser.search.defaultenginename=DuckDuckGo HTML + +# Search engine order (order displayed in the search bar dropdown)s +browser.search.order.1=DuckDuckGo HTML +browser.search.order.2=DuckDuckGo Lite +browser.search.order.3=Seeks Search + +# 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/html/?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 + +# The default set of protocol handlers for irc: +gecko.handlerService.schemes.irc.0.name=Freenode +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s + +# The default set of protocol handlers for ircs: +gecko.handlerService.schemes.ircs.0.name=Freenode +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index cc5889c7a..5010b4298 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -16,7 +16,7 @@ _pgo=false pkgname=icecat pkgver=17.0.1 -pkgrel=1 +pkgrel=2 pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!' arch=(i686 x86_64 mips64el) license=(GPL2 MPL LGPL) diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index bf2dff437..497b8cd10 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -1,394 +1,26 @@ -diff -Nur a/browser/branding/unofficial/locales/browserconfig.properties b/browser/branding/unofficial/locales/browserconfig.properties ---- a/browser/branding/unofficial/locales/browserconfig.properties -+++ b/browser/branding/unofficial/locales/browserconfig.properties -@@ -3,5 +3,29 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - # Do NOT localize or otherwise change these values -+ -+# Default startup homepage - browser.startup.homepage=about:home --browser.search.defaultenginename="DuckDuckGo" -+ -+# Default search engine -+browser.search.defaultenginename=DuckDuckGo HTML -+ -+# Search engine order (order displayed in the search bar dropdown)s -+browser.search.order.1=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=Seeks Search -+ -+# 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 -+ -+# The default set of protocol handlers for irc: -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/ -+ -+# The default set of protocol handlers for ircs: -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ -diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js ---- a/browser/app/profile/firefox.js 2012-12-01 16:06:30.000000000 -0200 -+++ b/browser/app/profile/firefox.js 2012-12-04 20:42:20.753633713 -0200 -@@ -324,15 +324,15 @@ - pref("browser.search.searchEnginesURL","http://www.gnu.org/software/gnuzilla/addons.html#search%20engines"); - - // pointer to the default engine name --pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); -+pref("browser.search.defaultenginename", "chrome://branding/locale/browserconfig.properties"); - - // disable logging for the search service by default - pref("browser.search.log", false); - - // Ordering of Search Engines in the Engine list. --pref("browser.search.order.1", "chrome://browser-region/locale/region.properties"); --pref("browser.search.order.2", "chrome://browser-region/locale/region.properties"); --pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); -+pref("browser.search.order.1", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.search.order.2", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.search.order.3", "chrome://branding/locale/browserconfig.properties"); - - // search bar results always open in a new tab - pref("browser.search.openintab", false); -@@ -616,23 +616,23 @@ - pref("browser.send_pings", false); - - /* initial web feed readers list */ --pref("browser.contentHandlers.types.0.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.0.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.0.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.0.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.0.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.1.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.1.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.1.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.1.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.1.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.2.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.2.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.2.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.2.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.2.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.3.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.3.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.3.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.3.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.3.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.4.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.4.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.4.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.4.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.4.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.5.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.5.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.5.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.5.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed"); - - pref("browser.feeds.handler", "ask"); -@@ -643,7 +643,7 @@ - // region.properties file is newer than the version number in the handler - // service datastore, it will add any new handlers it finds in the prefs (as - // seeded by this file) to its datastore. --pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.defaultHandlersVersion", "chrome://branding/locale/browserconfig.properties"); - - // The default set of web-based protocol handlers shown in the application - // selection dialog for webcal: ; I've arbitrarily picked 4 default handlers -@@ -651,65 +651,65 @@ - // protocol not currently listed here), we should go ahead and add those. - - // webcal --pref("gecko.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.1.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.2.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.3.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.schemes.webcal.0.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.1.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.2.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.3.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://branding/locale/browserconfig.properties"); - - // mailto --pref("gecko.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.2.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.3.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.schemes.mailto.0.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.1.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.2.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.3.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://branding/locale/browserconfig.properties"); - - // irc --pref("gecko.handlerService.schemes.irc.0.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.1.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.2.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.3.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.schemes.irc.0.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.1.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.2.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.3.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://branding/locale/browserconfig.properties"); - - // ircs --pref("gecko.handlerService.schemes.ircs.0.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.1.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.2.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.3.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.schemes.ircs.0.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.1.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.2.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.3.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://branding/locale/browserconfig.properties"); - - // By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287 - pref("gecko.handlerService.allowRegisterFromDifferentHost", false); - - #ifdef MOZ_SAFE_BROWSING --pref("browser.safebrowsing.enabled", true); --pref("browser.safebrowsing.malware.enabled", true); -+pref("browser.safebrowsing.enabled", false); -+pref("browser.safebrowsing.malware.enabled", false); - pref("browser.safebrowsing.debug", false); - --pref("browser.safebrowsing.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2"); --pref("browser.safebrowsing.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2"); --pref("browser.safebrowsing.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2"); --pref("browser.safebrowsing.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?"); --pref("browser.safebrowsing.reportGenericURL", "http://%LOCALE%.phish-generic.mozilla.com/?hl=%LOCALE%"); --pref("browser.safebrowsing.reportErrorURL", "http://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%"); --pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%"); --pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%"); --pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%"); -+pref("browser.safebrowsing.updateURL", ""); -+pref("browser.safebrowsing.keyURL", ""); -+pref("browser.safebrowsing.gethashURL", ""); -+pref("browser.safebrowsing.reportURL", ""); -+pref("browser.safebrowsing.reportGenericURL", ""); -+pref("browser.safebrowsing.reportErrorURL", ""); -+pref("browser.safebrowsing.reportPhishURL", ""); -+pref("browser.safebrowsing.reportMalwareURL", ""); -+pref("browser.safebrowsing.reportMalwareErrorURL", ""); - --pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/phishing-protection/"); --pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site="); -+pref("browser.safebrowsing.warning.infoURL", ""); -+pref("browser.safebrowsing.malware.reportURL", ""); - - // Name of the about: page contributed by safebrowsing to handle display of error - // pages on phishing/malware hits. (bug 399233) -@@ -1149,13 +1149,3 @@ - // might keep around more than this, but we'll try to get down to this value). +diff -urN a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -1150,11 +1150,9 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); -- + -// Example social provider -pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}"); --// Comma-separated list of nsIURI::prePaths that are allowed to activate --// built-in social functionality. + // Comma-separated list of nsIURI::prePaths that are allowed to activate + // built-in social functionality. -pref("social.activation.whitelist", "https://www.facebook.com"); --pref("social.sidebar.open", true); --pref("social.sidebar.unload_timeout_ms", 10000); --pref("social.active", false); --pref("social.toast-notifications.enabled", true); -diff -Nur a/browser/branding/unofficial/content/aboutHome.js b/browser/branding/unofficial/content/aboutHome.js ---- a/browser/branding/unofficial/content/aboutHome.js -+++ b/browser/branding/unofficial/content/aboutHome.js -@@ -5,100 +5,41 @@ - // If a definition requires additional params, check that the final search url - // is handled correctly by the engine. - const SEARCH_ENGINES = { -- "Duck Duck Go": { -- image: "data:image/png;base64,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"}, -- "Google": { -+ "DuckDuckGo HTML": { - image: "data:image/png;base64," + -- "iVBORw0KGgoAAAANSUhEUgAAAEYAAAAcCAYAAADcO8kVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ" + -- "bWFnZVJlYWR5ccllPAAADHdJREFUeNrsWQl0VNUZvve9NzNJJpnsIkuEJMoqAVJAodCKoFUsAUFQ" + -- "qhig0npaRUE8Viv1FFtQWxSwLXVhEawbhOWobOICFCGiEIIQRGIgCSFjMslsb9567+1/Z+7gmIYK" + -- "Vivt6Ztzz5y5b+7yf//3f/9/38PoW7gYY+i7uDDG39heJfT/q91LGTiTIcWJkCxzxDmCCBGCkBEO" + -- "FDCm5CPs+CGWYvcliRxEzDwgu9I/IzZClonQgT/jC9Eu3GFTz6sdKc57kIzHWKaFjIA2wz++Zhkn" + -- "yblMIDkAFIcDDFcQ+vtjGJuaOlKPkB2G4V4U9kcu8zfWlPtPVX/g9zZ7QwE03jDTqzWVndBUc57a" + -- "Up91gToce0cf3R05El5u6gYyNQ0BKK/x/nNmjKwwxBmx8/eSNHiWsVLXlBJ/7UdTazcN3gn3bYEw" + -- "FmG3pvOobRuScoc+ibEyF6GsUugrgEYuMGD4nqltmJjqFBkt+gcJ/ed0SZIA5crZ+gumrpQ0H319" + -- "ogBFh6aJFoGmQguf2n7tu62HnvgJ1cPBcN3m6dAnX4CM4QAQigmxdQthm9EEJ58bY3bOl/CQ2YE5" + -- "pu24LdBwZE7De+M+4gBAs/IntETphOHD4FOzNoNPbjuzBkn+48/9qKXywWPcM99Edvh2siPfHeyc" + -- "nH8mU/pM2pJLsfshI0KCNRv7viiYYXW7sRnmxTFQhCp3G9/CTqzLsht3jtkrmGJdgGF0xmYpQx5G" + -- "KBEInWdWSs4pnm6bLD3i95WJsDG7jmtiXFYwlmF2WXATmCPROE05IGa3G33sxPrsL014tGRMVo5D" + -- "uVdirD/8zJBluQgC9qSF2JKcV9cuPwudsbq1YLqCydjYGOkSngYtKq36vJUs6jqhuqXtgCvursty" + -- "uHOnSZIMWROnc/dR2J5pYAZO3tF0rOwvAXI/jvKZ/vN6zVNuHQGWjYNx/SWGiohtH9R1Y17HDRvf" + -- "4XtUCEoaQwyGbEOr5QZ3HeeLbRwrosnRNB5lHNwpuBn+HK2KWFsLcd34scWpGJd5g6Ener61faoQ" + -- "bOXk6OsWpycnP98yYdzMrLINxYks+3h1fvZlHfE6M6LXu0oa4mPko8s7TL70kuSnOmVIMxvW5n2v" + -- "00111fF1htzXWiwpnrJAw8FbD60qXtHn9o9LUrJ6r2CUBoOnDpQeKxu0ncPhntgRwKLRcErUVd9t" + -- "k1falinlvLLmLr7WHfndsh/t0WOdg9Dt1cOHTyrctWutRGzH5ZbNjcQ0FpEce+lMQwCnpMRqnSQ3" + -- "Qu50hFIzMXJnSsjt+aI+fG/kiOwUStcFQuG9AMor0GUI0da6btoyKxIKnWKaXlR/zajFCYWlXNBB" + -- "WslMKz+tpOEezkIxJtJzuvfl5ia1DCiQnuki6+MiXzRlR47s9Lwdaa1bCKAc4uscXnX5mwFvzdO6" + -- "JnlQSv8lgiOUERZ1QYLG4PqJE+ZItl2y4MDB3wjma8/XnGiuavSuUMNhKNOshdyZkmViD7EAGBrX" + -- "K9gzA1CYqPZEfEoAEK91eN3jTELIlRT7jnuhm9M5mxrmJZVNvjUio0VEC3Exr2ryLTbVCJI0/ZfL" + -- "e/TI5ZusfbXbKAcjP2706msTQRHiH3pxa2ghgIlkU+9b91zqRA6OK6MIQh+nG8HP6wT4PPzD3n3z" + -- "lxoRiohl5eVd/1G/qC2Ug8LBOcMYh5PYd6mqemTRJ8d88axb3r//NTkYT2tQ1e27W3yzo+aamh0k" + -- "NoWIcfeJ1Ss8A2EU0xgqflEkYQBGBuYAe3hByAHiNVBcqyRdLzEjYLhpEGFk/CaHXFtZX79RD4WR" + -- "Bl4plOWR3MhkbI0DMOHfFhNjaEK6Neas1D9Rg3qVHQFwLHIV9DkN01miaxD6LNUjQpKPMQLHl522" + -- "jWAVtQxELTM7agBN+AdcGwYNvJREtDwjrOL5hQWpVf36TTtcVFRhGMaAlxsbpw+prCwt/fRTHoZE" + -- "MVS1Sna5r5CUpKExisc0RVFix4BoKEFHlDES78dIcYjdf0FRhapqH5tQxAyTtiOwZHVTk3dWdnaV" + -- "zFgv27a5RzfKlt6PAiOZFQWmrUTy2Y3WFntPdgruhXVWxIFRA2ZIBq9QqeP18PvlBPAtRq0gHGNQ" + -- "uHbN4ej+qJDDmMZIaaZZYASC/MzTe1RScmmdqlZce/z4CLFfW7RoppWsSP1Wy7R5NeTpfMNnU+s2" + -- "pGIZ2KC4oEGoOOCb/7aNpkKbWKsswhhoUrQZBmPdp/hXcWDUQCjIGZFByLB2Su9ogaUaRhAa8hsG" + -- "DxXFCmlB8CBKleyhZynXiWkwv6VRpEVYkBtnBGq28bMPZcmjC0rKCxPLFqy4GDWbVwSOPemLGhvP" + -- "SMJNlc2+es0fQGYo5HnH59sCoMQLWVU0LV4ISqHjf/obtbQQxCbMnPngRcM25MbCB5giDo+Hl6Xg" + -- "qtVd6yqWeu7e91RyR++Rd28OthAUaLZRa+0Rrg+SNxQqD0dDyRx9lmqY6brOVDi7HFHV9/mWvV5z" + -- "r63aSCF0yDOlcla7NZrFmA3AeH2E1052/ebi1ZZ6ej3oh8eZ2fe1vtPqOTi495SaHygOOc1/dOFj" + -- "QnsYhdMw44lFaMysU6dOBCBvRcCB35fl+0X4am3COCaakdoVjVaoZgW1dESJnSd5hiz/7NU02Qbd" + -- "4dpDYdLL7wizOLW5OGoRTAM+G0VCBrg0yDOMXRGJPB8GNpim2efF7Ozi9hgA4Hfxm0b53NbW/Zyy" + -- "i7bQlyJBFjIjDF1ViKe29xhEJizP0Flw6S76klhfrX+j8C7dt/8BPRxpsGnGyqKfGRQ7O20OVr80" + -- "NVT9bIMIBwhrygMsLr7RcKvT9bUq1zXLumVtdvaAs56V+GK+3UMXEK15HzU1jvANHa47/YIGJ2cT" + -- "DmAWSIZtUdT9tiDpNjEQpZ1pJpumqiKih0AfSHTB2X7/2w2GsT4CNM8k5NlnPJ7Eyg+vT0+faVqW" + -- "Z2tEu1cYaC3fQxsPnaS/swAYN2K/qnhQHpgAKC6/Xx6Qgtmkilo2Z9WHrFHQnO/Bf/rtoctPlOVM" + -- "az35/pKIyhCAh6SUQre4H/M+L7lAqJl+RvKsVeHw0pBlntJME2VQunVzRsaERCfuyMzMfyszMzN+" + -- "ak52XTQ2333prxdJzuyRXGSw7KjFEnlUwYF1zrROLbxO4umwcVOWkjV0z51YyXqaEQsR9djYQMX4" + -- "TTwVQst8NiVlPqS+Upj0EAyZB9+tcB4ZByJ71V5C7ntcj550Q4KBTl7pvjFVmtbnYvSQ7ACcEZoD" + -- "fTUwbgDE490fN6B5o5fRjdAXiDNBGKLwNVMLZnTJLPrDh1hypAFHAkTzXnNqc+GHfG75oYxVYN0k" + -- "YEwQXPEAcuF9ZIH/01ku1/ChivJHkNCeMk8sCNXChCdhQr7+6uvC4RU4d8RJ1PRuV64JKdDSU3su" + -- "HuHMuKJUcuWMhMU4QHwflWBHgFEb4tXuSs3gEaLV7bdDlXvU6rm7hKH8SobmmawohUNkeSDUghdD" + -- "0vfXMrbnYdOoSij6Eg108TFje6EOMwbjwZ0zUHeXA5GGANoz6jm2VwCotikBcN7YpvHEtvrDnoqh" + -- "t58kuzpDJcoPhQDO6YGn3+pTK/007QYUoClgOUHpWAUuldPV4VYYn8rXfMDpHN4NS4McOBpsJ7fZ" + -- "9utrbNvLWYdzrq5H3PO+Hfmy8GCKaI7U7o/3wq6ObklOIkhykcD+sbuFMeKAcKYos8RvSczhEgLM" + -- "EioJknDoTEznWLDNJb5RO2POPBfqf2frdFN3LAz6Im+agU9e+Xzn8HLod+dcueXnDk/vX2DZlQaK" + -- "/ebpLV0miPmcCXs1xZySWC9JMA/Fz3/CeXZbgcTCIEVMqiSAkFguxQ0mX06IX9KueIuPpV/xPCS+" + -- "ttQGnDMs6Tej8SaseF4LN9c9cnxNj6VxI8Q+3em9Hx+c3PmW1UDztMZtXVLEfdymbGAJ60kJGZQm" + -- "tH99bE8YGN/wd/mgxdG7NFDb8/ZohryYA5HguHhI5uYO27vyoqtrmAiXr31JX/V48CuY8R8FJhxE" + -- "eeEAQWk9HnYlFmMJoRKG03QLtUJ7/93FvpXXJ7wM/6Za4l71UEu5pWkoucv0Be0tm95vmUdy5t5k" + -- "tpbPbe8B2vmsi7+rl2Nf4yVaUlLHSQXu7r8tw1JyT+ivhQBaAhZUxBSC5EPpPtMKVDzi3z/+HZHJ" + -- "7K/7IvC/CRhZ6Ep6evGGyXJS3kAsp3SGcgLKc7uSktBhrW7ZFq32r/HHCVbb0P9fBSYOTpIoJ5SE" + -- "7GUnpHbrbG8EzsfWfwgwAEfC/ToQIhkhAAAAAElFTkSuQmCC" -- , params: "source=hp&channel=np" -- } -- --, "Яндекс": -- { -- image: "data:image/png;base64," + -- "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" - } - }; - -@@ -115,8 +56,8 @@ - const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. - - // Bug with dom.storage.enabled set as false --// We are using DDG as a default in this case. --let gSearchEngine = {"name": "Duck Duck Go", "searchUrl": "https://duckduckgo.com/html/?t=icecat&q=_searchTerms_"}; -+// We are using DDG HTML as a default in this case. -+let gSearchEngine = {"name": "DuckDuckGo HTML", "searchUrl": "https://duckduckgo.com/html/?q=_searchTerms_"}; - - document.addEventListener("DOMContentLoaded", function init() { - setupSearchEngine(); -diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties ++pref("social.activation.whitelist", ""); + pref("social.sidebar.open", true); + pref("social.sidebar.unload_timeout_ms", 10000); + pref("social.active", false); +diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties --- a/browser/locales/en-US/chrome/browser-region/region.properties +++ b/browser/locales/en-US/chrome/browser-region/region.properties -@@ -3,30 +3,18 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. +@@ -10,23 +10,11 @@ + browser.search.order.2=Google + browser.search.order.3=Yahoo - # Default search engine --browser.search.defaultenginename=DuckDuckGo -+browser.search.defaultenginename=DuckDuckGo HTML - - # Search engine order (order displayed in the search bar dropdown)s --browser.search.order.1=DuckDuckGo --browser.search.order.2=Google --browser.search.order.3=Yahoo -- -# This is the default set of web based feed handlers shown in the reader -# selection UI -browser.contentHandlers.types.0.title=Bloglines @@ -400,10 +32,7 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow - -# Keyword URL (for location bar searches) -keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= -+browser.search.order.1=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=Seeks Search - +- # 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 @@ -420,11 +49,33 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow + +# The default set of protocol handlers for irc: +gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/ ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s + +# The default set of protocol handlers for ircs: +gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s +diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul +--- a/dom/ipc/test.xul ++++ b/dom/ipc/test.xul +@@ -294,6 +294,6 @@ + oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> + </toolbar> + +- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/> ++ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/> + <label id="messageLog" value="" crop="center"/> + </window> +diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul +--- a/layout/ipc/test-ipcbrowser.xul ++++ b/layout/ipc/test-ipcbrowser.xul +@@ -69,6 +69,6 @@ + label="setViewportScale"/> + </toolbar> + +- <browser type="content" src="http://www.google.com/" flex="1" id="content" ++ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content" + remote="true"/> + </window> diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in --- a/browser/locales/generic/profile/bookmarks.html.in +++ b/browser/locales/generic/profile/bookmarks.html.in @@ -455,150 +106,3 @@ diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/ + <DT><A HREF="http://www.h-node.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC7zrYAWYhNANjj1QA9fEcAEEwBAHTQkwAeVRkAPXMvALvOtwASVQEAHFcUAH/bpgB60p8AKnQmAGO1fgAjaRwALmA1AA5EAQDM2sgAN3ApAG7EjgC5zbQAVJxrAChwIgC0ya8ALmczAHXJmQBNf0EAgd6oADhwKgC8z7cA7vPtANTg0QANPwAARIhSADtyLQBzzpQAus21AEeKVQDC070AieyzALzPuAB93qEALGYvAO/z7gBEiVAAasWFAFuJTwBKil4AXotSAEuKXgAORQEAD0gBABlDFwBWpmoALGYwAGCNVQAbYBAAHGAQABBOAQCI6rIAjPG3AB1bDgAaXg4A////AGaRWwB/2qYAUYJEAEx+PwAZXAwAm7eUAD51MADN28oAJmwhACRiFAAzeTYAasaFAB9eDwBkt34Aus62AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPT09PT09PT09PT09PT09PT09PT0OIjALPRQmMkI9PT09PT09OkcHNQU+Q0oQPT09PT09PToVGDQtI0ABKz09PT09PT06JRg0Nh1ALxk9PT09PT09OiUYIS4TQC83PT09PT09PTpPSDsGG0BEAz09PT09PT06T0BGMRIsTRY9PT09PT09OgACJx8gQwooPT09PT09PToICAkJCUkkPT09PT09PT05HggETio9PT09PT09PT09Px4IERw9PT09PT09PT09PUUpCDMMPT09PT09PT09PT0NOEEEGj09PT09PT09PT09TBcPSzw9PT09PT09PT09PT09PT09PT09PT09PQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%3D">h-node</A> </DL><p> </DL><p> -diff -Nur a/build/pgo/blueprint/elements.html b/build/pgo/blueprint/elements.html ---- a/build/pgo/blueprint/elements.html -+++ b/build/pgo/blueprint/elements.html -@@ -143,7 +143,7 @@ - </p> - <p> - <a><a> anchor</a><br> -- <a href="http://www.google.com"><a> a + href</a> -+ <a href="https://duckduckgo.com/html"><a> a + href</a> - </p> - <p> - <abbr title="extended abbr text should show when mouse over"><abbr> abbr - extended text when mouseover.</abbr><br> -diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul ---- a/dom/ipc/test.xul -+++ b/dom/ipc/test.xul -@@ -294,6 +294,6 @@ - oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> - </toolbar> - -- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/> -+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/> - <label id="messageLog" value="" crop="center"/> - </window> -diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul ---- a/layout/ipc/test-ipcbrowser.xul -+++ b/layout/ipc/test-ipcbrowser.xul -@@ -69,6 +69,6 @@ - label="setViewportScale"/> - </toolbar> - -- <browser type="content" src="http://www.google.com/" flex="1" id="content" -+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content" - remote="true"/> - </window> -diff -Nur a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js ---- a/mobile/android/app/mobile.js -+++ b/mobile/android/app/mobile.js -@@ -230,13 +230,13 @@ - /* preferences for the Get Add-ons pane */ - pref("extensions.getAddons.cache.enabled", true); - pref("extensions.getAddons.maxResults", 15); --pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/android/recommended/"); --pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%"); --pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/android/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); --pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%"); --pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/"); --pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%"); --pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); -+pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.recommended.url","http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.browseURL","http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.url","http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.browseAddons","http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.get.url","http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/software/gnuzilla/addons.html"); - - /* preference for the locale picker */ - pref("extensions.getLocales.get.url", ""); -diff -Nur a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US/chrome/region.properties ---- a/mobile/locales/en-US/chrome/region.properties 2012-08-21 21:53:59.000000000 -0300 -+++ b/mobile/locales/en-US/chrome/region.properties 2012-11-30 01:12:12.823875656 -0200 -@@ -1,18 +1,8 @@ - # Default search engine --browser.search.defaultenginename=Google -+browser.search.defaultenginename=DuckDuckGo HTML - - # Search engine order (order displayed in the search bar dropdown)s --browser.search.order.1=Google -- --# This is the default set of web based feed handlers shown in the reader --# selection UI --browser.contentHandlers.types.0.title=My Yahoo --browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s --browser.contentHandlers.types.1.title=Google --browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s -- --# Keyword URL (for location bar searches) --keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= -+browser.search.order.1=DuckDuckGo HTML - - # 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 -@@ -21,12 +11,10 @@ - # don't make any spelling errors here. - gecko.handlerService.defaultHandlersVersion=2 - --# The default set of protocol handlers for webcal: --gecko.handlerService.schemes.webcal.0.name=30 Boxes --gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s -- --# The default set of protocol handlers for mailto: --gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail --gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s --gecko.handlerService.schemes.mailto.1.name=Gmail --gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s -+# The default set of protocol handlers for irc: -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/ -+ -+# The default set of protocol handlers for ircs: -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ -diff -Nur a/mobile/xul/app/mobile.js b/mobile/xul/app/mobile.js ---- a/mobile/xul/app/mobile.js -+++ b/mobile/xul/app/mobile.js -@@ -221,13 +221,13 @@ - /* preferences for the Get Add-ons pane */ - pref("extensions.getAddons.cache.enabled", true); - pref("extensions.getAddons.maxResults", 15); --pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/"); --pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%"); --pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); --pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%"); --pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/"); --pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%"); --pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); -+pref("extensions.getAddons.recommended.browseURL","http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.recommended.url","http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.browseURL","http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.url","http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.browseAddons","http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.get.url","http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/software/gnuzilla/addons.html"); - - /* preference for the locale picker */ - pref("extensions.getLocales.get.url", ""); -@@ -247,7 +247,7 @@ - pref("dom.disable_window_open_dialog_feature", true); - - pref("keyword.enabled", true); --pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q="); -+pref("keyword.URL",""); - - pref("accessibility.typeaheadfind", false); - pref("accessibility.typeaheadfind.timeout", 5000); -diff -Nur a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js ---- a/modules/libpref/src/init/all.js -+++ b/modules/libpref/src/init/all.js -@@ -52,7 +52,7 @@ - * - Computed values (e.g. 50 * 1024) don't work. - */ - --pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q="); -+pref("keyword.URL",""); - pref("keyword.enabled", false); - pref("general.useragent.locale", "chrome://global/locale/intl.properties"); - pref("general.useragent.compatMode.firefox", false); diff --git a/libre/icecat/vendor.js b/libre/icecat/vendor.js index d8d606bc1..3fbf3d7b7 100644 --- a/libre/icecat/vendor.js +++ b/libre/icecat/vendor.js @@ -7,3 +7,7 @@ pref("browser.shell.checkDefaultBrowser", false); // Don't disable our bundled extensions in the application directory pref("extensions.autoDisableScopes", 11); pref("extensions.shownSelectionUI", true); + +// Make sure that safebrowsing is disabled +pref("browser.safebrowsing.enabled", false); +pref("browser.safebrowsing.malware.enabled", false); diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index 7e983a88c..208e176ba 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -10,7 +10,7 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) -pkgrel=1 +pkgrel=2 pkgdesc="Language packs for Debian Icedove." arch=('i686' 'x86_64' 'mips64el') url="http://packages.debian.org/source/experimental/icedove" @@ -35,6 +35,7 @@ do package_icedove-l10n-$(echo $lang | tr A-Z a-z)() { replaces=(icedove-i18n-$(echo $lang | tr A-Z a-z)) conflicts=(icedove-i18n-$(echo $lang | tr A-Z a-z)) + provides=(icedove-i18n-$(echo $lang | tr A-Z a-z)) install -Dm644 \"\$srcdir/langpack-$lang@icedove.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@icedove.mozilla.org.xpi\" } " diff --git a/libre/iceweasel-l10n/Makefile b/libre/iceweasel-l10n/Makefile new file mode 100644 index 000000000..d596111f3 --- /dev/null +++ b/libre/iceweasel-l10n/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-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD new file mode 100644 index 000000000..b2b937601 --- /dev/null +++ b/libre/iceweasel-l10n/PKGBUILD @@ -0,0 +1,166 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: fauno <fauno@kiwwwi.com.ar> +# Contributor: Figue <ffigue@gmail.com> +# Maintainer : Márcio Silva <coadde@lavabit.com> +# Maintainer : André Silva <emulatorman@lavabit.com> +# 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=18.0 +_debrel=1 +_debrepo=http://ftp.debian.org/debian/pool/main/ +debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } + +_langpacks=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij 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-l10n +pkgname=($(for lang in ${_langpacks[@]} + do echo $pkgbase-$lang | tr A-Z a-z + done)) +_pkgver=18.0 +pkgver=$_debver.$_debrel +pkgrel=5 + +pkgdesc="Language packs for Debian Iceweasel." +arch=('any') +url="http://www.geticeweasel.org/" +license=('MPL') +depends=("iceweasel-libre>=$pkgver") +makedepends=('unzip' 'zip') +source=('region.properties') +for lang in ${_langpacks[@]} +do + source+=("${_debrepo}/`debfile ${_debname}`-l10n-$(echo $lang | tr A-Z a-z)_${_debver}-${_debrel}_all.deb") +done + +_path="/usr/lib/iceweasel/extensions" + +build() { + cd "${srcdir}" + for f in *.deb + do + bsdtar xf $f + bsdtar xf data.tar.xz + done + + cd $srcdir/$_path + + for i in ${_langpacks[@]} + do + cd $srcdir/$_path + unzip -q langpack-$i@iceweasel.mozilla.org.xpi -d $i + rm langpack-$i@iceweasel.mozilla.org.xpi + install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region + cd $i + zip -q -r $srcdir/$_path/langpack-$i@iceweasel.mozilla.org.xpi . + done + + cd $srcdir +} + +for lang in ${_langpacks[@]} +do + eval " +package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() { + replaces=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z)) + conflicts=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(echo $lang | tr A-Z a-z)) + provides=(iceweasel-i18n-$(echo $lang | tr A-Z a-z) iceweasel-libre-l10n-$(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=('428246ef3fb64103ff2cf5eaae2a92ca' + '08556c8d27a4313b5e67e655d2e1e828' + '9fa01f43db09b12cd724f94c28883a9e' + '0d1ef852709fcae1842105d675c22312' + '56247c867b52a19808ca72f7fceb349a' + 'dd670bcc609c06139671bf953f26d7b8' + 'df233884b68c8f37ff9b757b6480ae94' + 'd2aa803c6e1d1ebbaf9d4f6ad73f2aa8' + 'd0f512e8bf97110a60b16de59b15869b' + '54045555373497393ded8bccc0dc1784' + '61cb757a64268141518ed9dad4795106' + '62f338f7bcd7fb50ef2f61936c0e4990' + '97b2c6a0de5d60b4e5696973aedd3cfc' + 'd916a0b470264a9271509ed7a109e360' + '6f442a2989b814f20f4b73975bc97a5c' + '6117d8d24dad056f143feb3e061702dd' + 'c759f731a415f99a73e20090f4893184' + 'b481b08da143ff45a84d32285249fcfd' + '828f9a5b69634b39d48bfdf472a957bd' + '12d4b6779cb50777303381d35f539c4c' + '8609fd343e1e91724f50d6833d3e2f82' + '331acfbad62badfd48713d9b461efcf3' + '49216a2ea50fcd01057bd7b0d14a78e2' + 'b0738cf3f5ce546134150e082cffaf61' + '9f03cd24990c897e75594229517c1e9a' + '5667260492203f29bba1b2732ce20b77' + 'a1dd5872ab73a1a14ce3e285138445da' + '03e82d09ba4026ab10df5cfc3b78ca5f' + '1e92e7b3725cdfa94fc705ab54c7c6aa' + '35d9a0ccfa3c95a3a56f29c7a5bc4e6b' + '656dbfb6ac9efbeb4e58b5b9fc5fda03' + '29a343077a3de07ce9bb3e4d24d6a11a' + '831e09a24d4d40cb1bb45f980b7fa251' + '8488c98293d6f16caf99cf556f999611' + '92b07db5dcb8fc95ac8f5706b94d7ed5' + 'fa9ee1b85adbd15c46ca075d94e62a14' + '19383d5cb3ed6de8599118dd9f54889e' + 'fdff305ce5b154b12907fa302419548c' + '24df7d71f1a70e8225e80d15a53d3777' + '793bfd1301c4e989e2f904ad9f6b3adc' + '06d4e4423df0908254e422d207292858' + 'd53dce3f9b3a5de374dd6c10ebe3665c' + '382e5237a81fbbbaab499c5c6646b308' + '1da9f5ce8cbd3bdcc46f932b7458574f' + 'd635c40c88a7430a2103c13cdf1b58d3' + 'd1eac26314ade41883b24b91cd9e01c6' + '6e65dd6b8cb0fbd4395e548926043e70' + '97e8c9b3db047651a38f29366867c92e' + '87433742c0b21c7655988d5586667d77' + 'ac5cab1c45e0accf718cf624c8545dea' + 'd3f2ff9a817dff71fa05ffe5f3f45db8' + 'd1909b644b4495343b6d041c15683ad2' + '5c79b17dd9d0d83f749f52d489b347a7' + '433f0456e52420955a3689d2b18b7a94' + '90ee54b793a100b74f1b91ca2acb103b' + '0544d0e7e26a0c07379f0c6ca22708d8' + 'c75d55a574f525f5f08574cb01a2ee20' + 'b43589a4b08112996c756db467015eab' + '82782fd09a815441622187ed8839b0ee' + '52de8e6386f0232d13c6768092089c23' + '091e065f1723fa7fa7701ced828e24ed' + 'a036b50e5915e5b37257fa048e8d7a60' + '1037213a49539a069b9e223dacfbdc94' + '251b43c207b4fb0842a913e658f868c3' + '1aac06560c3a0957087eab1d2034eba3' + '964b3edfd3221d8e412ef695bd9a7b00' + '45a900da3f1cc4834b32b190c67c42af' + 'cad9df2808fd8f009d27142a729f21d6' + '192eaff8883db984c42ee43e3a5303f4' + '1000e395379bc6ef3b9c2c891f615e44' + '1da3d8777bc0595dea09fdd7222b55f3' + '0fbdd7294e21936ae75aca56d4d7252c' + 'af481ef78e4ffe7b4cbf892c5cb10cc2' + 'fc884a9a8203c56196993f6ed65069ca' + '1bebdd6e194cbb746f81725e317eb9b4' + '4c75d146f27aa2a70b0219954baa8965' + 'd832ceafecac23a0659f7a766f6d98de' + 'ed056fa5b30ddf55042699713c629503' + '8e698f20270de2b2fbaf9c1f09257c06' + 'e864caf42db46efbaa229f36af572ee4' + '013864da4a811e894ba1605e7f93e80e' + '69be7804b3d6a6bb5683554cbc324bed' + 'efc6a8427f080706d7d590a7b0eacadd' + '40c41e04514e3cbcae33b15a062b3811' + '164850087cdf79d57569ee9d4e1a8d2d' + '226de7be23de61db7df718ef93f7c906' + 'fb331d7fd4f1c853192111663e2672a0' + '5dd0a89e43aa0f263fc7c1d4302dbfd6' + '8e602db8304ddafad17fd8098125d37b') diff --git a/libre/iceweasel-l10n/PKGBUILD.in b/libre/iceweasel-l10n/PKGBUILD.in new file mode 100644 index 000000000..16017fa61 --- /dev/null +++ b/libre/iceweasel-l10n/PKGBUILD.in @@ -0,0 +1,80 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Contributor: fauno <fauno@kiwwwi.com.ar> +# Contributor: Figue <ffigue@gmail.com> +# 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-l10n +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)) + +_path="/usr/lib/iceweasel-${_pkgver}/extensions" + +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 + +cd $srcdir$_path + +for i in ${_langpacks[@]} +do + unzip -q langpack-$i@iceweasel.mozilla.org.xpi -d $i + rm langpack-$i@iceweasel.mozilla.org.xpi + install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region + zip -q -r langpack-$i@iceweasel.mozilla.org.xpi $i +done + +cd $srcdir +} + + + +# CUT HERE <-- Separates package_*() functions from everything else. + +for lang in ${_langpacks[@]} +do + eval " +package_iceweasel-l10n-$(echo $lang | tr A-Z a-z) () { + replaces=(iceweasel-i18n-$(echo $lang | tr A-Z a-z)) + conflicts=(iceweasel-i18n-$(echo $lang | tr A-Z a-z)) + provides=(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-l10n/region.properties b/libre/iceweasel-l10n/region.properties new file mode 100644 index 000000000..4399d8db7 --- /dev/null +++ b/libre/iceweasel-l10n/region.properties @@ -0,0 +1,32 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# Default search engine +browser.search.defaultenginename=DuckDuckGo HTML + +# Search engine order (order displayed in the search bar dropdown)s +browser.search.order.1=DuckDuckGo HTML +browser.search.order.2=DuckDuckGo Lite +browser.search.order.3=Seeks Search + +# 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/html/?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 + +# The default set of protocol handlers for irc: +gecko.handlerService.schemes.irc.0.name=Freenode +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s + +# The default set of protocol handlers for ircs: +gecko.handlerService.schemes.ircs.0.name=Freenode +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index 12cdb98d5..1180c114f 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=1 +pkgrel=4 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi if $_pgo; then @@ -30,7 +30,7 @@ if $_pgo; then fi pkgdesc="A libre version of Debian Iceweasel, the Browser based on Mozilla Firefox." -arch=('i586' 'i686' 'x86_64' 'mips64el') +arch=('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.14.1' 'sqlite3' 'startup-notification') makedepends=( 'autoconf2.13' 'diffutils' 'imagemagick' 'libidl2' 'librsvg' 'libxslt' 'mesa' 'pkg-config' 'python2' 'quilt' 'unzip' 'zip') @@ -52,16 +52,20 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" iceweasel-install-dir.patch vendor.js shared-libs.patch + bug677092.patch + replace-urls.txt Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) md5sums=('366e1e4847d7e00eba77ee5a4be0d3db' '6a571d3a3b355c331f67d57702f4fccf' '619e8f7c8596838a7daf2b7ce2e54cd3' 'ac29b01c189f20abae2f3eef1618ffc0' - '7d16be01a546d7733ab28db980d230f3' + '1ee2d4bcacee73d671b9ffa17a02abaa' '2823e0ecdefc16b590a9997f9228924a' 'abf5ecb74caa857abb42bcfbb3442d9c' - '0d053487907de4376d67d8f499c5502b' + '6dd547c72bb875a3101135a1c32d4783' '52e52f840a49eb1d14be1c0065b03a93' + '23520aca140fb0dd3e1b6f21b21f591f' + 'a8fc4658d45b6bf9350023e5c3f34e56' '65f68090d2a69b467bd2707d0c4ea3bd') if [ "$_pkgname" != "$pkgname" ]; then @@ -95,8 +99,25 @@ build() { patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname - patch -Np1 -i "$srcdir/libre.patch" patch -Np1 -i "$srcdir/shared-libs.patch" + + # Back out https://bugzilla.mozilla.org/show_bug.cgi?id=677092 + # in order to fix https://bugzilla.mozilla.org/show_bug.cgi?id=818468 + patch -Rp1 -i ../bug677092.patch + + # Replace common URLs + sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do + if [[ -n $moz_url ]]; then + printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url" + grep -Erl "${moz_url}" \ + --exclude='*.'{patch,orig,rej} \ + --exclude-dir={.pc,test,tests,testing} \ + | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g" + fi + done + + # Patch anything that's left + patch -Np1 -i "$srcdir/libre.patch" cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 83ba6e04e..f80295e55 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,460 +1,22 @@ -diff -urN iceweasel-18.0.orig/browser/app/profile/firefox.js iceweasel-18.0/browser/app/profile/firefox.js ---- iceweasel-18.0.orig/browser/app/profile/firefox.js 2013-01-10 01:04:16.600370827 -0200 -+++ iceweasel-18.0/browser/app/profile/firefox.js 2013-01-09 19:58:30.691632825 -0200 -@@ -37,11 +37,10 @@ - // 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%&platform=%OS%&appver=%VERSION%"); --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%/%COMPATIBILITY_MODE%"); -+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); - - // Blocklist preferences - pref("extensions.blocklist.enabled", true); -@@ -328,18 +327,18 @@ - pref("browser.download.panel.removeFinishedDownloads", false); - - // 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#search%20engines"); - - // pointer to the default engine name --pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); -+pref("browser.search.defaultenginename", "chrome://branding/locale/browserconfig.properties"); - - // disable logging for the search service by default - pref("browser.search.log", false); - - // Ordering of Search Engines in the Engine list. --pref("browser.search.order.1", "chrome://browser-region/locale/region.properties"); --pref("browser.search.order.2", "chrome://browser-region/locale/region.properties"); --pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); -+pref("browser.search.order.1", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.search.order.2", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.search.order.3", "chrome://branding/locale/browserconfig.properties"); - - // search bar results always open in a new tab - pref("browser.search.openintab", false); -@@ -570,7 +569,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); -@@ -622,23 +621,23 @@ - pref("browser.send_pings", false); - - /* initial web feed readers list */ --pref("browser.contentHandlers.types.0.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.0.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.0.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.0.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.0.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.1.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.1.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.1.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.1.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.1.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.2.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.2.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.2.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.2.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.2.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.3.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.3.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.3.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.3.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.3.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.4.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.4.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.4.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.4.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.4.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.5.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.5.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.5.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.5.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed"); - - pref("browser.feeds.handler", "ask"); -@@ -649,7 +648,7 @@ - // region.properties file is newer than the version number in the handler - // service datastore, it will add any new handlers it finds in the prefs (as - // seeded by this file) to its datastore. --pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.defaultHandlersVersion", "chrome://branding/locale/browserconfig.properties"); - - // The default set of web-based protocol handlers shown in the application - // selection dialog for webcal: ; I've arbitrarily picked 4 default handlers -@@ -657,65 +656,65 @@ - // protocol not currently listed here), we should go ahead and add those. - - // webcal --pref("gecko.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.1.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.2.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.3.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.schemes.webcal.0.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.1.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.2.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.3.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://branding/locale/browserconfig.properties"); - - // mailto --pref("gecko.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.2.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.3.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.schemes.mailto.0.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.1.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.2.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.3.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://branding/locale/browserconfig.properties"); - - // irc --pref("gecko.handlerService.schemes.irc.0.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.1.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.2.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.3.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.schemes.irc.0.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.1.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.2.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.3.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://branding/locale/browserconfig.properties"); - - // ircs --pref("gecko.handlerService.schemes.ircs.0.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.1.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.2.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.3.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.schemes.ircs.0.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.1.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.2.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.3.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://branding/locale/browserconfig.properties"); - - // By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287 - pref("gecko.handlerService.allowRegisterFromDifferentHost", false); - - #ifdef MOZ_SAFE_BROWSING --pref("browser.safebrowsing.enabled", true); --pref("browser.safebrowsing.malware.enabled", true); -+pref("browser.safebrowsing.enabled", false); -+pref("browser.safebrowsing.malware.enabled", false); - pref("browser.safebrowsing.debug", false); - --pref("browser.safebrowsing.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2"); --pref("browser.safebrowsing.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2"); --pref("browser.safebrowsing.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2"); --pref("browser.safebrowsing.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?"); --pref("browser.safebrowsing.reportGenericURL", "http://%LOCALE%.phish-generic.mozilla.com/?hl=%LOCALE%"); --pref("browser.safebrowsing.reportErrorURL", "http://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%"); --pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%"); --pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%"); --pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%"); -+pref("browser.safebrowsing.updateURL", ""); -+pref("browser.safebrowsing.keyURL", ""); -+pref("browser.safebrowsing.gethashURL", ""); -+pref("browser.safebrowsing.reportURL", ""); -+pref("browser.safebrowsing.reportGenericURL", ""); -+pref("browser.safebrowsing.reportErrorURL", ""); -+pref("browser.safebrowsing.reportPhishURL", ""); -+pref("browser.safebrowsing.reportMalwareURL", ""); -+pref("browser.safebrowsing.reportMalwareErrorURL", ""); - --pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/phishing-protection/"); --pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site="); -+pref("browser.safebrowsing.warning.infoURL", ""); -+pref("browser.safebrowsing.malware.reportURL", ""); - - // Name of the about: page contributed by safebrowsing to handle display of error - // pages on phishing/malware hits. (bug 399233) -@@ -1168,14 +1167,4 @@ +diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js +--- mozilla-release.orig/browser/app/profile/firefox.js 2013-01-10 20:20:02.000000000 -0500 ++++ mozilla-release/browser/app/profile/firefox.js 2013-01-10 17:47:34.000000000 -0500 +@@ -1168,11 +1168,9 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); -// Example social provider -pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}"); --// Comma-separated list of nsIURI::prePaths that are allowed to activate --// built-in social functionality. + // Comma-separated list of nsIURI::prePaths that are allowed to activate + // built-in social functionality. -pref("social.activation.whitelist", "https://www.facebook.com"); --pref("social.sidebar.open", true); --pref("social.sidebar.unload_timeout_ms", 10000); --pref("social.active", false); --pref("social.toast-notifications.enabled", true); -- - pref("dom.identity.enabled", false); -diff -urN iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties ---- iceweasel-17.0.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-20 00:45:50.000000000 -0200 -+++ iceweasel-17.0/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 21:45:00.486713730 -0200 -@@ -3,25 +3,18 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - # Default search engine --browser.search.defaultenginename=Google -+browser.search.defaultenginename=DuckDuckGo HTML - - # Search engine order (order displayed in the search bar dropdown)s --browser.search.order.1=Google --browser.search.order.2=Yahoo --browser.search.order.3=Bing -- --# This is the default set of web based feed handlers shown in the reader --# selection UI --browser.contentHandlers.types.0.title=Google --browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s --browser.contentHandlers.types.1.title=My Yahoo! --browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s -+browser.search.order.1=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=Seeks Search - - # 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://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} -+browser.search.siteSearchURL=https://duckduckgo.com/html/?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 -@@ -30,20 +23,10 @@ - # don't make any spelling errors here. - gecko.handlerService.defaultHandlersVersion=3 - --# The default set of protocol handlers for webcal: --gecko.handlerService.schemes.webcal.0.name=30 Boxes --gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s -- --# The default set of protocol handlers for mailto: --gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail --gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s --gecko.handlerService.schemes.mailto.1.name=Gmail --gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s -- - # The default set of protocol handlers for irc: --gecko.handlerService.schemes.irc.0.name=Mibbit --gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/ - - # The default set of protocol handlers for ircs: --gecko.handlerService.schemes.ircs.0.name=Mibbit --gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ -diff -urN iceweasel-13.0.orig/build/pgo/blueprint/elements.html iceweasel-13.0/build/pgo/blueprint/elements.html ---- iceweasel-13.0.orig/build/pgo/blueprint/elements.html 2012-06-01 09:03:49.000000000 -0300 -+++ iceweasel-13.0/build/pgo/blueprint/elements.html 2012-06-05 20:37:22.059133787 -0300 -@@ -143,7 +143,7 @@ - </p> - <p> - <a><a> anchor</a><br> -- <a href="http://www.google.com"><a> a + href</a> -+ <a href="https://duckduckgo.com/html"><a> a + href</a> - </p> - <p> - <abbr title="extended abbr text should show when mouse over"><abbr> abbr - extended text when mouseover.</abbr><br> -diff -urN iceweasel-13.0.orig/dom/ipc/test.xul iceweasel-13.0/dom/ipc/test.xul ---- iceweasel-13.0.orig/dom/ipc/test.xul 2012-06-01 09:03:55.000000000 -0300 -+++ iceweasel-13.0/dom/ipc/test.xul 2012-06-05 20:40:59.453890004 -0300 -@@ -294,6 +294,6 @@ - oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> - </toolbar> - -- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/> -+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/> - <label id="messageLog" value="" crop="center"/> - </window> -diff -Naur iceweasel-14.0.1.orig/mobile/android/app/mobile.js iceweasel-14.0.1.orig/mobile/android/app/mobile.js ---- iceweasel-14.0.1.orig/mobile/android/app/mobile.js 2012-07-12 14:27:37.000000000 -0300 -+++ iceweasel-14.0.1/mobile/android/app/mobile.js 2012-07-17 22:14:47.293560718 -0300 -@@ -226,13 +226,13 @@ - /* preferences for the Get Add-ons pane */ - pref("extensions.getAddons.cache.enabled", true); - pref("extensions.getAddons.maxResults", 15); --pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/android/recommended/"); --pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%"); --pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/android/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); --pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%"); --pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/android/"); --pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%"); --pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/android/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); -+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.recommended.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.browseAddons", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/software/gnuzilla/addons.html"); - - /* preference for the locale picker */ - pref("extensions.getLocales.get.url", ""); -diff -urN iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul iceweasel-13.0/layout/ipc/test-ipcbrowser.xul ---- iceweasel-13.0.orig/layout/ipc/test-ipcbrowser.xul 2012-06-01 09:04:06.000000000 -0300 -+++ iceweasel-13.0/layout/ipc/test-ipcbrowser.xul 2012-06-05 20:44:00.714006926 -0300 -@@ -69,6 +69,6 @@ - label="setViewportScale"/> - </toolbar> - -- <browser type="content" src="http://www.google.com/" flex="1" id="content" -+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content" - remote="true"/> - </window> -diff -urN iceweasel-14.0.1.orig/mobile/xul/app/mobile.js iceweasel-14.0.1/mobile/xul/app/mobile.js ---- iceweasel-14.0.1.orig/mobile/xul/app/mobile.js 2012-06-01 09:04:14.000000000 -0300 -+++ iceweasel-14.0.1/mobile/xul/app/mobile.js 2012-06-05 20:48:20.193241600 -0300 -@@ -221,13 +221,12 @@ - /* preferences for the Get Add-ons pane */ - pref("extensions.getAddons.cache.enabled", true); - pref("extensions.getAddons.maxResults", 15); --pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/"); --pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%"); --pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%&platform=%OS%&appver=%VERSION%"); --pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%"); --pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/"); --pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%"); --pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%"); -+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.recommended.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.browseAddons", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); - - /* preference for the locale picker */ - pref("extensions.getLocales.get.url", ""); -@@ -247,7 +246,7 @@ - pref("dom.disable_window_open_dialog_feature", true); - - pref("keyword.enabled", true); --pref("keyword.URL", "https://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&q="); -+pref("keyword.URL", ""); - - pref("accessibility.typeaheadfind", false); - pref("accessibility.typeaheadfind.timeout", 5000); -diff -urN iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties iceweasel-17.0/mobile/locales/en-US/chrome/region.properties ---- iceweasel-17.0.orig/mobile/locales/en-US/chrome/region.properties 2012-11-20 00:46:15.000000000 -0200 -+++ iceweasel-17.0/mobile/locales/en-US/chrome/region.properties 2012-11-30 01:51:40.078652322 -0200 -@@ -3,34 +3,7 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - # Default search engine --browser.search.defaultenginename=Google -+browser.search.defaultenginename=DuckDuckGo HTML - - # Search engine order (order displayed in the search bar dropdown)s --browser.search.order.1=Google -- --# This is the default set of web based feed handlers shown in the reader --# selection UI --browser.contentHandlers.types.0.title=My Yahoo --browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s --browser.contentHandlers.types.1.title=Google --browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s -- --# Keyword URL (for location bar searches) --keyword.URL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= -- --# 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=2 -- --# The default set of protocol handlers for webcal: --gecko.handlerService.schemes.webcal.0.name=30 Boxes --gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s -- --# The default set of protocol handlers for mailto: --gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail --gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s --gecko.handlerService.schemes.mailto.1.name=Gmail --gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s -+browser.search.order.1=DuckDuckGo HTML -diff -urN iceweasel-14.0.orig/modules/libpref/src/init/all.js iceweasel-14.0/modules/libpref/src/init/all.js ---- iceweasel-14.0.orig/modules/libpref/src/init/all.js 2012-06-01 09:04:16.000000000 -0300 -+++ iceweasel-14.0/modules/libpref/src/init/all.js 2012-06-05 20:55:41.569045759 -0300 -@@ -47,7 +47,7 @@ - // SYNTAX HINTS: dashes are delimiters. Use underscores instead. - // The first character after a period must be alphabetic. - --pref("keyword.URL", "https://www.google.com/search?ie=UTF-8&oe=utf-8&q="); -+pref("keyword.URL", ""); - pref("keyword.enabled", false); - pref("general.useragent.locale", "chrome://global/locale/intl.properties"); - pref("general.useragent.compatMode.firefox", false); -diff -urN iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-14.0.1/browser/locales/generic/profile/bookmarks.html.in ---- iceweasel-14.0.1.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300 -+++ iceweasel-14.0.1/browser/locales/generic/profile/bookmarks.html.in 2012-06-15 22:54:08.446274144 -0300 -@@ -11,13 +11,20 @@ - <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> - <DD>@bookmarks_toolbarfolder_description@ - <DL><p> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A> -+ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D" ID="rdf:#$GvPhC3">Parabola GNU/Linux-libre</A> - </DL><p> -- <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3> -+ <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3> - <DL><p> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A> -- <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A> -+ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre</A> -+ <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Packages</A> -+ <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Wiki</A> -+ <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Labs</A> -+ </DL><p> -+ <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3> -+ <DL><p> -+ <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A> -+ <DT><A HREF="http://libreplanet.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC/v78AAAAAAPLy9ABsbakA/f3+APn5+QC6ur0A6urqAEpLbQACBLQApKW3AAULuQDMzMwAGBiDAL29vQCgocsAgnzJALu82QA+PpsAAQOvAOjo6ADZ2dkAysrKALS0zwD5+foAAgKRAAYGdQD19fUADhOjAAQJyACrnqIAxMTLAOnp7gDm5uYAzczNACgobwDg2dEAQkaeAA0RkAAUFnEA0MvQAIBzgAANDYsAk5OyAOTk5ADy8vYA1dXVAD8/cADGxsYA+fn7AAMHvgBzZnQApqauAAEGuQDExMQAAAGmAAoLmgADCMQAxMTdAAwPlwD+/v4ABg7MAF5ehADg4OAA0dHRAAAAoQAYEXAAwsLCALCxwQBnadkAAQGWAPz8/ACgoLgAbm6RANvb5wDr6+sA0dHSALe3uQADB8AAzc3NAGFhbAABAZcAOTtlALi4xwAAAJoA/Pz9AAQHnwADBJcACQl4AFVa3AChl6EAAgW2ABscdAABAq4A2NjYAAAAmwDAwMoAAQKmAAcMswDR0eQAAQSxANvX2wB4aXcAAQGpAAAAkwDW1tYAAgSpACIZZAAAAaEA+vr8AKuirAACBbcA8vLyALOztgADBZYAAACcAAACpwAEA6QAAQKnAPT09QD///8AvL3UADIpigDw8PAABwWOAK6dogBub4kAiozDANLS0gAFC8gAAgW4AP39/QAAAJ0A0NDQAMHBwQDp6ewACg2RAAIFqAAKCokA+/v7AAkOnwAAAaMA7OzsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4eHh4eHh4eHh4eHh4AXh4eHhlbikzZlooeHh4eAF4eHh4hX1JVFweInh4eHgBeHh4XmlAGXNGSB8VeHh4AXg8LhaGcV9zKg0wQF54eAF4K0NNOGthjXNCUwAMS3gBPC82iW+CCRN2Iz4wTwx4AW0GgCc5OU41VnSKTBoOiwEFTz8hHIF5RANdQVRfNIMBeBUhe0o9jB0Pcjdzc1E8AXgsB3AbUlkQRVtnhHNoeAF4i45wJCAlYjJbdYRfY3gBeDwmEn4XMToKZDd6WDx4AXh4VTsIfwt3FGpsfAR4eAF4eHgEEYhQAodXYDx4eHgBeHh4eHg8GC1HPHh4eHh4AQABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAA%3D">LibrePlanet</A> -+ <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</A> -+ <DT><A HREF="http://www.h-node.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC7zrYAWYhNANjj1QA9fEcAEEwBAHTQkwAeVRkAPXMvALvOtwASVQEAHFcUAH/bpgB60p8AKnQmAGO1fgAjaRwALmA1AA5EAQDM2sgAN3ApAG7EjgC5zbQAVJxrAChwIgC0ya8ALmczAHXJmQBNf0EAgd6oADhwKgC8z7cA7vPtANTg0QANPwAARIhSADtyLQBzzpQAus21AEeKVQDC070AieyzALzPuAB93qEALGYvAO/z7gBEiVAAasWFAFuJTwBKil4AXotSAEuKXgAORQEAD0gBABlDFwBWpmoALGYwAGCNVQAbYBAAHGAQABBOAQCI6rIAjPG3AB1bDgAaXg4A////AGaRWwB/2qYAUYJEAEx+PwAZXAwAm7eUAD51MADN28oAJmwhACRiFAAzeTYAasaFAB9eDwBkt34Aus62AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPT09PT09PT09PT09PT09PT09PT0OIjALPRQmMkI9PT09PT09OkcHNQU+Q0oQPT09PT09PToVGDQtI0ABKz09PT09PT06JRg0Nh1ALxk9PT09PT09OiUYIS4TQC83PT09PT09PTpPSDsGG0BEAz09PT09PT06T0BGMRIsTRY9PT09PT09OgACJx8gQwooPT09PT09PToICAkJCUkkPT09PT09PT05HggETio9PT09PT09PT09Px4IERw9PT09PT09PT09PUUpCDMMPT09PT09PT09PT0NOEEEGj09PT09PT09PT09TBcPSzw9PT09PT09PT09PT09PT09PT09PT09PQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%3D">h-node</A> - </DL><p> - </DL><p> -diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-18.0/browser/base/content/abouthome/aboutHome.js ---- iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.js 2013-01-04 21:44:27.000000000 -0200 -+++ iceweasel-18.0/browser/base/content/abouthome/aboutHome.js 2013-01-10 00:53:04.008909619 -0200 ++pref("social.activation.whitelist", ""); + pref("social.sidebar.open", true); + pref("social.sidebar.unload_timeout_ms", 10000); + pref("social.active", false); +diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-01-04 18:44:27.000000000 -0500 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-01-10 18:26:10.000000000 -0500 @@ -5,70 +5,41 @@ // If a definition requires additional params, check that the final search url // is handled correctly by the engine. @@ -560,17 +122,15 @@ diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.js icewea } }; -@@ -78,8 +49,8 @@ +@@ -78,7 +49,7 @@ // * add an entry here in the proper ordering (based on spans) // The <a/> part of the snippet will be linked to the corresponding url. const DEFAULT_SNIPPETS_URLS = [ - "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1" --, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2" + "http://packages.debian.org/experimental/iceweasel" -+, "https://www.gnu.org/software/gnuzilla/addons.html" + , "https://www.gnu.org/software/gnuzilla/addons.html" ]; - const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. @@ -141,10 +112,6 @@ if (searchEngineInfo.image) { let logoElt = document.getElementById("searchEngineLogo"); @@ -582,50 +142,9 @@ diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.js icewea logoElt.alt = searchEngineName; } -diff -urN iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties iceweasel-17.0.1/debian/branding/locales/browserconfig.properties ---- iceweasel-17.0.1.orig/debian/branding/locales/browserconfig.properties 2012-12-01 07:21:01.000000000 -0200 -+++ iceweasel-17.0.1/debian/branding/locales/browserconfig.properties 2012-12-04 16:47:47.039271071 -0200 -@@ -1,3 +1,27 @@ - # Do NOT localize or otherwise change these values -+ -+# Default startup homepage - browser.startup.homepage=about:home - -+# Default search engine -+browser.search.defaultenginename=DuckDuckGo HTML -+ -+# Search engine order (order displayed in the search bar dropdown)s -+browser.search.order.1=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=Seeks Search -+ -+# 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 -+ -+# The default set of protocol handlers for irc: -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/ -+ -+# The default set of protocol handlers for ircs: -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ -diff -urN iceweasel-18.0.orig/debian/branding/firefox-branding.js iceweasel-18.0/debian/branding/firefox-branding.js ---- iceweasel-18.0.orig/debian/branding/firefox-branding.js 2013-01-08 17:55:47.000000000 -0200 -+++ iceweasel-18.0/debian/branding/firefox-branding.js 2013-01-10 01:49:05.807790675 -0200 -@@ -1,3 +1,6 @@ - pref("startup.homepage_override_url",""); - pref("startup.homepage_welcome_url",""); - pref("app.releaseNotesURL", "http://mozilla.debian.net/%LOCALE%/%APP%/%VERSION%/releasenotes/"); -+ -+// Disable localstorage for privacy reasons. -+pref("dom.storage.enabled", false); -diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.css iceweasel-18.0/browser/base/content/abouthome/aboutHome.css ---- iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.css 2013-01-04 21:44:27.000000000 -0200 -+++ iceweasel-18.0/browser/base/content/abouthome/aboutHome.css 2013-01-10 01:35:44.497079456 -0200 +diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css 2013-01-04 21:44:27.000000000 -0200 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2013-01-10 01:35:44.497079456 -0200 @@ -66,8 +66,7 @@ #searchEngineLogo { display: inline-block; @@ -636,3 +155,114 @@ diff -urN iceweasel-18.0.orig/browser/base/content/abouthome/aboutHome.css icewe } #searchText { +diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties +--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-20 00:45:50.000000000 -0200 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2012-11-28 21:45:00.486713730 -0200 +@@ -3,25 +3,18 @@ + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=DuckDuckGo HTML + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Google +-browser.search.order.2=Yahoo +-browser.search.order.3=Bing +- +-# This is the default set of web based feed handlers shown in the reader +-# selection UI +-browser.contentHandlers.types.0.title=Google +-browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s +-browser.contentHandlers.types.1.title=My Yahoo! +-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s ++browser.search.order.1=DuckDuckGo HTML ++browser.search.order.2=DuckDuckGo Lite ++browser.search.order.3=Seeks Search + + # 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://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} ++browser.search.siteSearchURL=https://duckduckgo.com/html/?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 +@@ -30,20 +23,10 @@ + # don't make any spelling errors here. + gecko.handlerService.defaultHandlersVersion=3 + +-# The default set of protocol handlers for webcal: +-gecko.handlerService.schemes.webcal.0.name=30 Boxes +-gecko.handlerService.schemes.webcal.0.uriTemplate=http://30boxes.com/external/widget?refer=ff&url=%s +- +-# The default set of protocol handlers for mailto: +-gecko.handlerService.schemes.mailto.0.name=Yahoo! Mail +-gecko.handlerService.schemes.mailto.0.uriTemplate=http://compose.mail.yahoo.com/?To=%s +-gecko.handlerService.schemes.mailto.1.name=Gmail +-gecko.handlerService.schemes.mailto.1.uriTemplate=https://mail.google.com/mail/?extsrc=mailto&url=%s +- + # The default set of protocol handlers for irc: +-gecko.handlerService.schemes.irc.0.name=Mibbit +-gecko.handlerService.schemes.irc.0.uriTemplate=https://www.mibbit.com/?url=%s ++gecko.handlerService.schemes.irc.0.name=Freenode ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s + + # The default set of protocol handlers for ircs: +-gecko.handlerService.schemes.ircs.0.name=Mibbit +-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s ++gecko.handlerService.schemes.ircs.0.name=Freenode ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s +diff -ruN mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul +--- mozilla-release.orig/dom/ipc/test.xul 2013-01-04 18:44:31.000000000 -0500 ++++ mozilla-release/dom/ipc/test.xul 2013-01-10 18:19:26.000000000 -0500 +@@ -299,6 +299,6 @@ + oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> + </toolbar> + +- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/> ++ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/> + <label id="messageLog" value="" crop="center"/> + </window> +diff -ruN mozilla-release.orig/layout/ipc/test-ipcbrowser.xul mozilla-release/layout/ipc/test-ipcbrowser.xul +--- mozilla-release.orig/layout/ipc/test-ipcbrowser.xul 2013-01-04 18:44:37.000000000 -0500 ++++ mozilla-release/layout/ipc/test-ipcbrowser.xul 2013-01-10 18:20:03.000000000 -0500 +@@ -73,6 +73,6 @@ + label="setViewportScale"/> + </toolbar> + +- <browser type="content" src="http://www.google.com/" flex="1" id="content" ++ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content" + remote="true"/> + </window> +diff -urN mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in +--- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2012-06-01 09:03:48.000000000 -0300 ++++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2012-06-15 22:54:08.446274144 -0300 +@@ -11,13 +11,20 @@ + <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3> + <DD>@bookmarks_toolbarfolder_description@ + <DL><p> +- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A> ++ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D" ID="rdf:#$GvPhC3">Parabola GNU/Linux-libre</A> + </DL><p> +- <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3> ++ <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3> + <DL><p> +- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A> +- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A> +- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A> +- <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A> ++ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre</A> ++ <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Packages</A> ++ <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Wiki</A> ++ <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Labs</A> ++ </DL><p> ++ <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3> ++ <DL><p> ++ <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A> ++ <DT><A HREF="http://libreplanet.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC/v78AAAAAAPLy9ABsbakA/f3+APn5+QC6ur0A6urqAEpLbQACBLQApKW3AAULuQDMzMwAGBiDAL29vQCgocsAgnzJALu82QA+PpsAAQOvAOjo6ADZ2dkAysrKALS0zwD5+foAAgKRAAYGdQD19fUADhOjAAQJyACrnqIAxMTLAOnp7gDm5uYAzczNACgobwDg2dEAQkaeAA0RkAAUFnEA0MvQAIBzgAANDYsAk5OyAOTk5ADy8vYA1dXVAD8/cADGxsYA+fn7AAMHvgBzZnQApqauAAEGuQDExMQAAAGmAAoLmgADCMQAxMTdAAwPlwD+/v4ABg7MAF5ehADg4OAA0dHRAAAAoQAYEXAAwsLCALCxwQBnadkAAQGWAPz8/ACgoLgAbm6RANvb5wDr6+sA0dHSALe3uQADB8AAzc3NAGFhbAABAZcAOTtlALi4xwAAAJoA/Pz9AAQHnwADBJcACQl4AFVa3AChl6EAAgW2ABscdAABAq4A2NjYAAAAmwDAwMoAAQKmAAcMswDR0eQAAQSxANvX2wB4aXcAAQGpAAAAkwDW1tYAAgSpACIZZAAAAaEA+vr8AKuirAACBbcA8vLyALOztgADBZYAAACcAAACpwAEA6QAAQKnAPT09QD///8AvL3UADIpigDw8PAABwWOAK6dogBub4kAiozDANLS0gAFC8gAAgW4AP39/QAAAJ0A0NDQAMHBwQDp6ewACg2RAAIFqAAKCokA+/v7AAkOnwAAAaMA7OzsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4eHh4eHh4eHh4eHh4AXh4eHhlbikzZlooeHh4eAF4eHh4hX1JVFweInh4eHgBeHh4XmlAGXNGSB8VeHh4AXg8LhaGcV9zKg0wQF54eAF4K0NNOGthjXNCUwAMS3gBPC82iW+CCRN2Iz4wTwx4AW0GgCc5OU41VnSKTBoOiwEFTz8hHIF5RANdQVRfNIMBeBUhe0o9jB0Pcjdzc1E8AXgsB3AbUlkQRVtnhHNoeAF4i45wJCAlYjJbdYRfY3gBeDwmEn4XMToKZDd6WDx4AXh4VTsIfwt3FGpsfAR4eAF4eHgEEYhQAodXYDx4eHgBeHh4eHg8GC1HPHh4eHh4AQABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAA%3D">LibrePlanet</A> ++ <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</A> ++ <DT><A HREF="http://www.h-node.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC7zrYAWYhNANjj1QA9fEcAEEwBAHTQkwAeVRkAPXMvALvOtwASVQEAHFcUAH/bpgB60p8AKnQmAGO1fgAjaRwALmA1AA5EAQDM2sgAN3ApAG7EjgC5zbQAVJxrAChwIgC0ya8ALmczAHXJmQBNf0EAgd6oADhwKgC8z7cA7vPtANTg0QANPwAARIhSADtyLQBzzpQAus21AEeKVQDC070AieyzALzPuAB93qEALGYvAO/z7gBEiVAAasWFAFuJTwBKil4AXotSAEuKXgAORQEAD0gBABlDFwBWpmoALGYwAGCNVQAbYBAAHGAQABBOAQCI6rIAjPG3AB1bDgAaXg4A////AGaRWwB/2qYAUYJEAEx+PwAZXAwAm7eUAD51MADN28oAJmwhACRiFAAzeTYAasaFAB9eDwBkt34Aus62AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPT09PT09PT09PT09PT09PT09PT0OIjALPRQmMkI9PT09PT09OkcHNQU+Q0oQPT09PT09PToVGDQtI0ABKz09PT09PT06JRg0Nh1ALxk9PT09PT09OiUYIS4TQC83PT09PT09PTpPSDsGG0BEAz09PT09PT06T0BGMRIsTRY9PT09PT09OgACJx8gQwooPT09PT09PToICAkJCUkkPT09PT09PT05HggETio9PT09PT09PT09Px4IERw9PT09PT09PT09PUUpCDMMPT09PT09PT09PT0NOEEEGj09PT09PT09PT09TBcPSzw9PT09PT09PT09PT09PT09PT09PT09PQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%3D">h-node</A> + </DL><p> + </DL><p> diff --git a/libre/iceweasel-libre/vendor.js b/libre/iceweasel-libre/vendor.js index d8d606bc1..865bfaec7 100644 --- a/libre/iceweasel-libre/vendor.js +++ b/libre/iceweasel-libre/vendor.js @@ -7,3 +7,12 @@ pref("browser.shell.checkDefaultBrowser", false); // Don't disable our bundled extensions in the application directory pref("extensions.autoDisableScopes", 11); pref("extensions.shownSelectionUI", true); + +// Make sure that safebrowsing is disabled +pref("browser.safebrowsing.enabled", false); +pref("browser.safebrowsing.malware.enabled", false); + +pref("keyword.URL", ""); +pref("app.update.enabled", false); +pref("app.update.auto", false); +pref("dom.storage.enabled", false); diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 583b679ca..936dc402a 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -2,25 +2,28 @@ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=35421 -pkgrel=1.1 -arch=('i686' 'x86_64') +pkgrel=2 +arch=('i686' 'x86_64' 'mips64el') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' -'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio' 'subversion') +'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio-paranoia' 'subversion') license=('GPL') url="http://www.mplayerhq.hu/" options=(!buildflags !emptydirs) -source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop) -md5sums=('b8a82ad1e1d6c3ac847074772daba817' - 'c0d6ef795cf6de48e3b87ff7c23f0319') +source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop cdio-includes.patch) +md5sums=('b5d8c24fc106b4ed58acda3b86c468fa' + 'c0d6ef795cf6de48e3b87ff7c23f0319' + 'dcf64a9113ecb99ec102108c901159e3') build() { cd "$srcdir/$_pkgbase" + patch -Np0 -i ../cdio-includes.patch ./configure --prefix=/usr \ --enable-runtime-cpudetection \ @@ -51,7 +54,7 @@ package_mplayer-libre() { backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig' 'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi' - 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio') + 'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio-paranoia') provides=("mplayer=$pkgver") replaces=('mplayer') conflicts=('mplayer') @@ -71,7 +74,7 @@ package_mplayer-libre() { package_mencoder-libre() { pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)" depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' - 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio' 'libvorbis') + 'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio-paranoia' 'libvorbis') provides=("mencoder=$pkgver") replaces=('mencoder') conflicts=('mencoder') @@ -80,5 +83,3 @@ package_mencoder-libre() { make DESTDIR="$pkgdir" install-mencoder install-mencoder-man find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \; } -md5sums=('b5d8c24fc106b4ed58acda3b86c468fa' - 'c0d6ef795cf6de48e3b87ff7c23f0319') diff --git a/libre/mplayer-libre/cdio-includes.patch b/libre/mplayer-libre/cdio-includes.patch new file mode 100644 index 000000000..894650717 --- /dev/null +++ b/libre/mplayer-libre/cdio-includes.patch @@ -0,0 +1,43 @@ +Index: configure +=================================================================== +--- configure (revision 35421) ++++ configure (working copy) +@@ -5968,8 +5968,8 @@ + cat > $TMPC << EOF + #include <stdio.h> + #include <cdio/version.h> +-#include <cdio/cdda.h> +-#include <cdio/paranoia.h> ++#include <cdio/paranoia/cdda.h> ++#include <cdio/paranoia/paranoia.h> + int main(void) { + void *test = cdda_verbose_set; + printf("%s\n", CDIO_VERSION); +Index: gui/win32/interface.c +=================================================================== +--- gui/win32/interface.c (revision 35421) ++++ gui/win32/interface.c (working copy) +@@ -24,7 +24,7 @@ + #include "config.h" + + #if defined(CONFIG_LIBCDIO) +-#include <cdio/cdda.h> ++#include <cdio/paranoia/cdda.h> + #elif defined(CONFIG_CDDA) + #include <cdda_interface.h> + #endif +Index: stream/stream_cdda.c +=================================================================== +--- stream/stream_cdda.c (revision 35421) ++++ stream/stream_cdda.c (working copy) +@@ -21,8 +21,8 @@ + #include <cdda_interface.h> + #include <cdda_paranoia.h> + #else +-#include <cdio/cdda.h> +-#include <cdio/paranoia.h> ++#include <cdio/paranoia/cdda.h> ++#include <cdio/paranoia/paranoia.h> + #endif + #include <stdio.h> + #include <stdlib.h> diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index c5b33cf75..f1042a9b1 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -4,17 +4,18 @@ # Contributor: Hugo Doria <hugo@archlinux.org> # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=mplayer-vaapi-libre pkgver=35107 -pkgrel=3.1 +pkgrel=4 pkgdesc="A movie player, compiled with vaapi (without unfree faac support)" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://gitorious.org/vaapi/mplayer" license=('GPL') -depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl' +depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio-paranoia' 'libxinerama' 'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu' - 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'speex' 'faad2' + 'sdl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'speex' 'faad2' 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' 'libbluray' 'libva' 'libass' 'desktop-file-utils') @@ -24,15 +25,18 @@ conflicts=('mplayer' 'mplayer-vaapi') replaces=('mplayer-vaapi') backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz + cdio-includes.patch tweak-desktop-file.patch) options=('!buildflags' '!emptydirs') install=mplayer-vaapi.install sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56' + '72e6c654f9733953ad2466d0ea1a52f23e753791d8232d90f13293eb1b358720' '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b') build() { cd "$srcdir/mplayer-vaapi-$pkgver" + patch -Np0 -i "$srcdir/cdio-includes.patch" patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch" ./configure \ diff --git a/libre/mplayer-vaapi-libre/cdio-includes.patch b/libre/mplayer-vaapi-libre/cdio-includes.patch new file mode 100644 index 000000000..894650717 --- /dev/null +++ b/libre/mplayer-vaapi-libre/cdio-includes.patch @@ -0,0 +1,43 @@ +Index: configure +=================================================================== +--- configure (revision 35421) ++++ configure (working copy) +@@ -5968,8 +5968,8 @@ + cat > $TMPC << EOF + #include <stdio.h> + #include <cdio/version.h> +-#include <cdio/cdda.h> +-#include <cdio/paranoia.h> ++#include <cdio/paranoia/cdda.h> ++#include <cdio/paranoia/paranoia.h> + int main(void) { + void *test = cdda_verbose_set; + printf("%s\n", CDIO_VERSION); +Index: gui/win32/interface.c +=================================================================== +--- gui/win32/interface.c (revision 35421) ++++ gui/win32/interface.c (working copy) +@@ -24,7 +24,7 @@ + #include "config.h" + + #if defined(CONFIG_LIBCDIO) +-#include <cdio/cdda.h> ++#include <cdio/paranoia/cdda.h> + #elif defined(CONFIG_CDDA) + #include <cdda_interface.h> + #endif +Index: stream/stream_cdda.c +=================================================================== +--- stream/stream_cdda.c (revision 35421) ++++ stream/stream_cdda.c (working copy) +@@ -21,8 +21,8 @@ + #include <cdda_interface.h> + #include <cdda_paranoia.h> + #else +-#include <cdio/cdda.h> +-#include <cdio/paranoia.h> ++#include <cdio/paranoia/cdda.h> ++#include <cdio/paranoia/paranoia.h> + #endif + #include <stdio.h> + #include <stdlib.h> diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD new file mode 100644 index 000000000..009d47398 --- /dev/null +++ b/pcr/pandoc/PKGBUILD @@ -0,0 +1,74 @@ +# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar> +# Based on haskell-pandoc + +# Run `makepkg -sp SRCBUILD` if you want to update the source tarball + +pkgname=pandoc +pkgver=1.9.4.5 +pkgrel=5 +pkgdesc='Conversion between markup formats (no Haskell libs)' +url='http://johnmacfarlane.net/pandoc/' +license=('GPL') +arch=('i686' 'x86_64') +makedepends=('ghc' 'sh' 'cabal-install') +options=(strip !makeflags !distcc) +source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} SRCBUILD) +conflicts=('haskell-pandoc') +optdepends=('texlive-most: for pdf creation') + +# PKGBUILD functions +build() { + mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}} + cd ${srcdir}/${pkgname}-${pkgver} + + while read _hkpkg; do + pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null + + msg2 "Building $_hkpkg" + + case $_hkpkg in + $pkgname-$pkgver) + HOME=${srcdir}/${pkgname}-${pkgver} \ + cabal configure --flags='-library' \ + --prefix=/usr \ + --libdir=${srcdir}/build/usr/lib -v + + HOME=${srcdir}/${pkgname}-${pkgver} \ + cabal build + ;; + + citeproc-hs-*) + HOME=${srcdir}/${pkgname}-${pkgver} \ + cabal install --flags='embed_data_files' \ + --prefix=${srcdir}/build/usr -v + ;; + + *) + HOME=${srcdir}/${pkgname}-${pkgver} \ + cabal install --prefix=${srcdir}/build/usr + ;; + esac + + popd >/dev/null + done <BUILDORDER + +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver} + + runghc Setup.hs copy --destdir=${pkgdir}/ + + msg2 "Removing lib files..." + rm -rfv ${pkgdir}/build + +# EC is unfree and makes Parabola TeXLive cry +# besides, it's unneeded + sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/templates/default.latex + + find ${pkgdir}/usr/share -type f -exec chmod 644 {} \; + find ${pkgdir}/usr/share -type d -exec chmod 755 {} \; +} +md5sums=('af01e55daded42fa54e8a2bb142c0a78' + '96d0ba0d9060574e56e3f23c996d0e8e' + '54b521d5c3ed5e2b53c4ca3206f6c941') diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD new file mode 100644 index 000000000..1eb01acc1 --- /dev/null +++ b/pcr/pandoc/SRCBUILD @@ -0,0 +1,47 @@ +# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar> +# Based on haskell-pandoc + +pkgname=pandoc +pkgver=1.9.4.5 +# 0.3.6 fails with embed_data_files +_citeproc=0.3.5 +# 0.4 doesn't work with ghc 7.6 +_blaze_html=0.5.1.3 +pkgrel=5 +pkgdesc='Conversion between markup formats (no Haskell libs)' +url='http://johnmacfarlane.net/pandoc/' +license=('GPL') +arch=('any') +makedepends=('ghc' 'sh' 'cabal-install') +source=() +options=(!strip) + +# PKGBUILD functions +build() { + mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}} + cd ${srcdir}/${pkgname}-${pkgver} + + HOME=${srcdir}/${pkgname}-${pkgver} \ + cabal --verbose=3 update + + HOME=${srcdir}/${pkgname}-${pkgver} \ + cabal --verbose=3 fetch file-embed blaze-html-${_blaze_html} citeproc-hs-${_citeproc} ${pkgname}-${pkgver} + + msg2 "Getting the dependency build order" +# Ignore the cabal messages + HOME=${srcdir}/${pkgname}-${pkgver} \ + cabal install --dry-run file-embed blaze-html-${_blaze_html} citeproc-hs-${_citeproc} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER +} + +package() { + export PKGEXT=.src.tar.xz + export PKGDEST=${SRCDEST} + + mkdir -p ${pkgdir}/${pkgname}-${pkgver} + cd ${pkgdir}/${pkgname}-${pkgver} + + find ${srcdir}/${pkgname}-${pkgver} -iname '*.tar.?z' -a \! -iname '00-index.tar.gz' -exec \ + bsdtar xvf '{}' \; + + cp ${srcdir}/${pkgname}-${pkgver}/BUILDORDER . +} diff --git a/social/libowfat/PKGBUILD b/social/libowfat/PKGBUILD index ea43adfab..4962068fb 100644 --- a/social/libowfat/PKGBUILD +++ b/social/libowfat/PKGBUILD @@ -4,8 +4,8 @@ # henning mueller <henning@orgizm.net> pkgname=libowfat -pkgver=0.28 -pkgrel=4 +pkgver=0.29 +pkgrel=1 pkgdesc='GPL reimplementation of libdjb' arch=(i686 x86_64) url=http://www.fefe.de/libowfat/ diff --git a/social/opentracker/PKGBUILD b/social/opentracker/PKGBUILD index f328607e7..2826a21ef 100644 --- a/social/opentracker/PKGBUILD +++ b/social/opentracker/PKGBUILD @@ -1,8 +1,9 @@ # Contributor: Pierre Schmitz <pierre@archlinux.de> +# Maintainer: Jonas Heinrich <onny@project-insanity.org> pkgname=opentracker -pkgver=20111020 -pkgrel=1 +pkgver=20120911 +pkgrel=2 pkgdesc='An open and free bittorrent tracker (open mode)' arch=('i686' 'x86_64') url='http://erdgeist.org/arts/software/opentracker/' @@ -10,13 +11,12 @@ license=('custom:Beer' 'GPL') makedepends=('libowfat' 'cvs') depends=('bash' 'zlib') backup=('etc/opentracker/config') -install=${pkgname}.install -source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz" - 'opentracker.rc.d' - 'license.txt') -md5sums=('1dbace4895b4e1d290790f8ebacb2a2f' - '390bde9d010e79ab1309c02dcf9972e8' - '865211941e882c0aff5d36a22ac9efaa') +source=('opentracker.rc' +'opentracker.service' +'license.txt') +md5sums=('390bde9d010e79ab1309c02dcf9972e8' +'3c638b71d5ecb65fb7964796975b2078' +'865211941e882c0aff5d36a22ac9efaa') _cvsroot=':pserver:anoncvs@cvs.erdgeist.org:/home/cvsroot' _cvsmod='opentracker' @@ -42,7 +42,6 @@ build() { cd "${srcdir}/${_cvsmod}" msg 'Starting make...' - sed -e 's|# tracker.rootdir /usr/local/etc/opentracker|tracker.rootdir /etc/opentracker|' \ -e 's|# access.stats 192.168.0.23|access.stats 127.0.0.1|' \ -i opentracker.conf.sample @@ -58,7 +57,14 @@ package(){ cd "${srcdir}/${_cvsmod}" install -D -m 755 opentracker $pkgdir/usr/bin/opentracker - install -D -m 755 $srcdir/opentracker.rc.d $pkgdir/etc/rc.d/opentracker install -D -m 644 opentracker.conf.sample $pkgdir/etc/opentracker/config install -D -m 644 $srcdir/license.txt $pkgdir/usr/share/licenses/opentracker/license.txt + + # create /etc/rc.d/opentracker + mkdir -p "$pkgdir/etc/rc.d/" + install -m 755 "$srcdir/opentracker.rc" "$pkgdir/etc/rc.d/opentracker" + + # Create opentracker service + mkdir -p "$pkgdir/usr/lib/systemd/system/" + install -m 644 "$srcdir/opentracker.service" "$pkgdir/usr/lib/systemd/system/" } |