diff options
Diffstat (limited to 'libre')
-rw-r--r-- | libre/bbswitch-libre/PKGBUILD | 2 | ||||
-rw-r--r-- | libre/cgminer-libre/PKGBUILD | 20 | ||||
-rw-r--r-- | libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/linux-libre/3.10.6-logitech-dj.patch | 172 | ||||
-rw-r--r-- | libre/linux-libre/3.10.6-reset-superseed-xhci-hcd.patch | 24 | ||||
-rw-r--r-- | libre/linux-libre/PKGBUILD | 32 | ||||
-rw-r--r-- | libre/linux-libre/config.i686 | 6 | ||||
-rw-r--r-- | libre/linux-libre/config.x86_64 | 8 | ||||
-rw-r--r-- | libre/linux-libre/criu-no-expert.patch | 22 | ||||
-rw-r--r-- | libre/lirc-libre/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/qupzilla-libre/PKGBUILD | 51 | ||||
-rw-r--r-- | libre/qupzilla-libre/libre.patch | 89 | ||||
-rw-r--r-- | libre/qupzilla-libre/qupzilla.install | 12 | ||||
-rw-r--r-- | libre/tp_smapi-libre/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/vhba-module-libre/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/webmin/PKGBUILD | 10 |
17 files changed, 435 insertions, 35 deletions
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 4b182c12e..ee87679de 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.7 _extramodules=extramodules-3.10-LIBRE # Don't forget to update bbswitch.install -pkgrel=8 +pkgrel=9 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 0fb3b9116..1dfda5055 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93146 2013-06-26 07:01:43Z fyan $ +# $Id: PKGBUILD 95514 2013-08-13 05:51:50Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: monson <holymonson@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,13 +7,13 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=3.3.1 +pkgver=3.3.3 pkgrel=1 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' license=('GPL3') arch=('i686' 'x86_64' 'mips64el') -depends=('curl' 'libcl-libre') +depends=('curl' 'libcl-libre' 'libusbx' 'jansson') makedepends=('opencl-headers') provides=(${pkgname%-$_pkgflag}=$pkgver) conflicts=${pkgname%-$_pkgflag} @@ -35,7 +35,17 @@ build() { #export CFLAGS="-O2 -march=native -mtune=native -msse2" #./autogen.sh - ./configure --prefix=/usr --enable-scrypt --disable-adl + ./configure \ + --prefix=/usr \ + --enable-scrypt \ + --enable-opencl \ + --enable-bflsc \ + --enable-bitforce \ + --enable-icarus \ + --enable-modminer \ + --enable-ztex \ + --enable-avalon \ + --disable-adl # For license issues make } @@ -51,6 +61,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -md5sums=('1e6ccf16c4695fc086581bbb95923abe' +md5sums=('2236a07713d604b1c23e781f0bb59dab' 'fe4a243fabe24608f5c05e40f0f118f6' 'bd76fc92fedce18c59ccea2aa79cc664') diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 62bf42f5c..97c2ebe12 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.89 +_kernver=3.0.90 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=12 +pkgrel=13 pkgdesc='Atheros alx ethernet device driver for Linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 37ed0646a..aff90a342 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 192083 2013-08-05 18:39:45Z tpowa $ +# $Id: PKGBUILD 192456 2013-08-12 08:25:27Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -8,7 +8,7 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=89 +_sublevel=90 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.89 # nearly always the same as pkgver @@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' - '6a26aec61a8f5bbaedf5d3205d60395f' + '70f76d2855affd72b4854fbb5de9005f' '7373cc3ac66342156a7fc32af8577b46' 'b7229f80282337979514f9640a969ff5' 'c072b17032e80debc6a8626299245d46' diff --git a/libre/linux-libre/3.10.6-logitech-dj.patch b/libre/linux-libre/3.10.6-logitech-dj.patch new file mode 100644 index 000000000..1c112ccde --- /dev/null +++ b/libre/linux-libre/3.10.6-logitech-dj.patch @@ -0,0 +1,172 @@ +From c63e0e370028d7e4033bd40165f18499872b5183 Mon Sep 17 00:00:00 2001 +From: Nestor Lopez Casado <nlopezcasad@logitech.com> +Date: Thu, 18 Jul 2013 13:21:30 +0000 +Subject: HID: Revert "Revert "HID: Fix logitech-dj: missing Unifying device issue"" + +This reverts commit 8af6c08830b1ae114d1a8b548b1f8b056e068887. + +This patch re-adds the workaround introduced by 596264082f10dd4 +which was reverted by 8af6c08830b1ae114. + +The original patch 596264 was needed to overcome a situation where +the hid-core would drop incoming reports while probe() was being +executed. + +This issue was solved by c849a6143bec520af which added +hid_device_io_start() and hid_device_io_stop() that enable a specific +hid driver to opt-in for input reports while its probe() is being +executed. + +Commit a9dd22b730857347 modified hid-logitech-dj so as to use the +functionality added to hid-core. Having done that, workaround 596264 +was no longer necessary and was reverted by 8af6c08. + +We now encounter a different problem that ends up 'again' thwarting +the Unifying receiver enumeration. The problem is time and usb controller +dependent. Ocasionally the reports sent to the usb receiver to start +the paired devices enumeration fail with -EPIPE and the receiver never +gets to enumerate the paired devices. + +With dcd9006b1b053c7b1c the problem was "hidden" as the call to the usb +driver became asynchronous and none was catching the error from the +failing URB. + +As the root cause for this failing SET_REPORT is not understood yet, +-possibly a race on the usb controller drivers or a problem with the +Unifying receiver- reintroducing this workaround solves the problem. + +Overall what this workaround does is: If an input report from an +unknown device is received, then a (re)enumeration is performed. + +related bug: +https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1194649 + +Signed-off-by: Nestor Lopez Casado <nlopezcasad@logitech.com> +Signed-off-by: Jiri Kosina <jkosina@suse.cz> +--- +diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c +index 5207591a..cd33084 100644 +--- a/drivers/hid/hid-logitech-dj.c ++++ b/drivers/hid/hid-logitech-dj.c +@@ -192,6 +192,7 @@ static struct hid_ll_driver logi_dj_ll_driver; + static int logi_dj_output_hidraw_report(struct hid_device *hid, u8 * buf, + size_t count, + unsigned char report_type); ++static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev); + + static void logi_dj_recv_destroy_djhid_device(struct dj_receiver_dev *djrcv_dev, + struct dj_report *dj_report) +@@ -232,6 +233,7 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev, + if (dj_report->report_params[DEVICE_PAIRED_PARAM_SPFUNCTION] & + SPFUNCTION_DEVICE_LIST_EMPTY) { + dbg_hid("%s: device list is empty\n", __func__); ++ djrcv_dev->querying_devices = false; + return; + } + +@@ -242,6 +244,12 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev, + return; + } + ++ if (djrcv_dev->paired_dj_devices[dj_report->device_index]) { ++ /* The device is already known. No need to reallocate it. */ ++ dbg_hid("%s: device is already known\n", __func__); ++ return; ++ } ++ + dj_hiddev = hid_allocate_device(); + if (IS_ERR(dj_hiddev)) { + dev_err(&djrcv_hdev->dev, "%s: hid_allocate_device failed\n", +@@ -305,6 +313,7 @@ static void delayedwork_callback(struct work_struct *work) + struct dj_report dj_report; + unsigned long flags; + int count; ++ int retval; + + dbg_hid("%s\n", __func__); + +@@ -337,6 +346,25 @@ static void delayedwork_callback(struct work_struct *work) + logi_dj_recv_destroy_djhid_device(djrcv_dev, &dj_report); + break; + default: ++ /* A normal report (i. e. not belonging to a pair/unpair notification) ++ * arriving here, means that the report arrived but we did not have a ++ * paired dj_device associated to the report's device_index, this ++ * means that the original "device paired" notification corresponding ++ * to this dj_device never arrived to this driver. The reason is that ++ * hid-core discards all packets coming from a device while probe() is ++ * executing. */ ++ if (!djrcv_dev->paired_dj_devices[dj_report.device_index]) { ++ /* ok, we don't know the device, just re-ask the ++ * receiver for the list of connected devices. */ ++ retval = logi_dj_recv_query_paired_devices(djrcv_dev); ++ if (!retval) { ++ /* everything went fine, so just leave */ ++ break; ++ } ++ dev_err(&djrcv_dev->hdev->dev, ++ "%s:logi_dj_recv_query_paired_devices " ++ "error:%d\n", __func__, retval); ++ } + dbg_hid("%s: unexpected report type\n", __func__); + } + } +@@ -367,6 +395,12 @@ static void logi_dj_recv_forward_null_report(struct dj_receiver_dev *djrcv_dev, + if (!djdev) { + dbg_hid("djrcv_dev->paired_dj_devices[dj_report->device_index]" + " is NULL, index %d\n", dj_report->device_index); ++ kfifo_in(&djrcv_dev->notif_fifo, dj_report, sizeof(struct dj_report)); ++ ++ if (schedule_work(&djrcv_dev->work) == 0) { ++ dbg_hid("%s: did not schedule the work item, was already " ++ "queued\n", __func__); ++ } + return; + } + +@@ -397,6 +431,12 @@ static void logi_dj_recv_forward_report(struct dj_receiver_dev *djrcv_dev, + if (dj_device == NULL) { + dbg_hid("djrcv_dev->paired_dj_devices[dj_report->device_index]" + " is NULL, index %d\n", dj_report->device_index); ++ kfifo_in(&djrcv_dev->notif_fifo, dj_report, sizeof(struct dj_report)); ++ ++ if (schedule_work(&djrcv_dev->work) == 0) { ++ dbg_hid("%s: did not schedule the work item, was already " ++ "queued\n", __func__); ++ } + return; + } + +@@ -444,6 +484,10 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev) + struct dj_report *dj_report; + int retval; + ++ /* no need to protect djrcv_dev->querying_devices */ ++ if (djrcv_dev->querying_devices) ++ return 0; ++ + dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL); + if (!dj_report) + return -ENOMEM; +@@ -455,6 +499,7 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev) + return retval; + } + ++ + static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev, + unsigned timeout) + { +diff --git a/drivers/hid/hid-logitech-dj.h b/drivers/hid/hid-logitech-dj.h +index fd28a5e..4a40003 100644 +--- a/drivers/hid/hid-logitech-dj.h ++++ b/drivers/hid/hid-logitech-dj.h +@@ -101,6 +101,7 @@ struct dj_receiver_dev { + struct work_struct work; + struct kfifo notif_fifo; + spinlock_t lock; ++ bool querying_devices; + }; + + struct dj_device { +-- +cgit v0.9.2 diff --git a/libre/linux-libre/3.10.6-reset-superseed-xhci-hcd.patch b/libre/linux-libre/3.10.6-reset-superseed-xhci-hcd.patch new file mode 100644 index 000000000..0415b8a1e --- /dev/null +++ b/libre/linux-libre/3.10.6-reset-superseed-xhci-hcd.patch @@ -0,0 +1,24 @@ +[PATCH] SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set + +If a device has the skip_vpd_pages flag set we should simply fail the +scsi_get_vpd_page() call. + +Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Acked-by: Alan Stern <stern@rowland.harvard.edu> +Tested-by: Stuart Foster <smf.linux@ntlworld.com> +Cc: stable@vger.kernel.org + +diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c +index 3b1ea34..eaa808e 100644 +--- a/drivers/scsi/scsi.c ++++ b/drivers/scsi/scsi.c +@@ -1031,6 +1031,9 @@ int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf, + { + int i, result; + ++ if (sdev->skip_vpd_pages) ++ goto fail; ++ + /* Ask for all the pages supported by this device */ + result = scsi_vpd_inquiry(sdev, buf, 0, buf_len); + if (result) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 3df9aa783..4124814f4 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 192042 2013-08-05 08:13:15Z tpowa $ +# $Id: PKGBUILD 192495 2013-08-13 09:26:23Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=5 +_sublevel=6 pkgver=${_basekernel}.${_sublevel} -pkgrel=1 -_lxopkgver=${_basekernel}.5 # nearly always the same as pkgver +pkgrel=2 +_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -29,17 +29,23 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' + 'criu-no-expert.patch' + '3.10.6-logitech-dj.patch' + '3.10.6-reset-superseed-xhci-hcd.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - 'f4810ea4bd977321d76edcde8dc756c9' - '1f848fda2af2e3fc3dfa992d625b3f9e' - 'd63ce6a34f077959b54bc38597582822' + '63a1c2aba22871f8e8dacdb4968d9a1f' + '8ec987449e0e42a1c98d8ce92b9019c2' + '8efbd1f17f37bdaa8649c8a63761bf07' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '6047f873d9c5ec552ab0bbfc125a4535') + 'd50c1ac47394e9aec637002ef3392bd1' + '3ff40ca684cfe719723e627e2cef7cea' + 'e751378a3e94532bfe85fb82c80e26c0' + '0f0e9441467a3eca33e23ebb75709f06') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -64,6 +70,16 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + # allow criu without expert option set + # patch from fedora + patch -Np1 -i "${srcdir}/criu-no-expert.patch" + + # fix https://bugs.archlinux.org/task/35991 - [linux] 3.10.x renders Logitech Unified Receivers useless + patch -Np1 -i "${srcdir}/3.10.6-logitech-dj.patch" + + # fix https://bugs.archlinux.org/task/36296 - [linux] 3.10.3 reset SuperSpeed USB using xhci_hcd + patch -Np1 -i "${srcdir}/3.10.6-reset-superseed-xhci-hcd.patch" + if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index c27f50b4c..be09f460c 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.0-1 Kernel Configuration +# Linux/x86 3.10.5-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -681,10 +681,12 @@ CONFIG_I82365=m CONFIG_TCIC=m CONFIG_PCMCIA_PROBE=y CONFIG_PCCARD_NONSTATIC=y -CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI=y CONFIG_HOTPLUG_PCI_COMPAQ=m # CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set CONFIG_HOTPLUG_PCI_IBM=m +CONFIG_HOTPLUG_PCI_ACPI=y +CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 04bbcdf7a..e69a7a587 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.0-1 Kernel Configuration +# Linux/x86 3.10.5-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -164,7 +164,7 @@ CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y # CONFIG_DEBUG_BLK_CGROUP is not set -CONFIG_CHECKPOINT_RESTORE=y +CONFIG_CHECKPOINT_RESTORE=y CONFIG_NAMESPACES=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y @@ -654,7 +654,9 @@ CONFIG_YENTA_TOSHIBA=y CONFIG_PD6729=m CONFIG_I82092=m CONFIG_PCCARD_NONSTATIC=y -CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI_ACPI=y +CONFIG_HOTPLUG_PCI_ACPI_IBM=m CONFIG_HOTPLUG_PCI_CPCI=y CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m diff --git a/libre/linux-libre/criu-no-expert.patch b/libre/linux-libre/criu-no-expert.patch new file mode 100644 index 000000000..2124427e9 --- /dev/null +++ b/libre/linux-libre/criu-no-expert.patch @@ -0,0 +1,22 @@ +diff --git a/init/Kconfig b/init/Kconfig +index be8b7f5..7461760 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP + endif # CGROUPS + + config CHECKPOINT_RESTORE +- bool "Checkpoint/restore support" if EXPERT ++ bool "Checkpoint/restore support" + default n + help + Enables additional kernel features in a sake of checkpoint/restore. +@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE + If unsure, say N here. + + menuconfig NAMESPACES +- bool "Namespaces support" if EXPERT ++ bool "Namespaces support" + default !EXPERT + help + Provides the way to make tasks work with different objects using diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 5b8466b3f..a3f93412c 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 192079 2013-08-05 16:42:39Z tpowa $ +# $Id: PKGBUILD 192454 2013-08-12 07:02:21Z tpowa $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=54 +pkgrel=55 epoch=1 _extramodules=extramodules-3.10-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD new file mode 100644 index 000000000..91420fb97 --- /dev/null +++ b/libre/qupzilla-libre/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 90358 2013-05-11 23:22:13Z speps $ +# Maintainer: speps <speps at aur dot archlinux dot org> +# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> + +_name=QupZilla +_pkgname=qupzilla +pkgname=qupzilla-libre +pkgver=1.4.3 +pkgrel=1.1 +pkgdesc="Cross-platform QtWebKit browser, without Google, Youtube and Facebook recommendation" +arch=(i686 x86_64 mips64el) +url="http://www.qupzilla.com/" +license=('GPL3') +depends=('qtwebkit' 'hunspell') +optdepends=('bash-completion: bash completion support') +install="$_pkgname.install" +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +source=("$_pkgname-$pkgver.tar.gz::https://github.com/$_name/$_pkgname/tarball/v$pkgver" + 'libre.patch') +md5sums=('20187fcce11dbba876e1ee7dc5e32583' + '20c8304eb790cda5491078bf5bf71d49') + +prepare() { + cd "$srcdir/$_name-$_pkgname-"* + + # remove Google, Youtube and Facebook recommendation + patch -Np1 -i $srcdir/libre.patch +} + +build() { + cd "$srcdir/$_name-$_pkgname-"* + + # enable webgl support + export USE_WEBGL=true + + qmake-qt4 QUPZILLA_PREFIX=/usr/ + make +} + +package() { + cd "$srcdir/$_name-$_pkgname-"* + make INSTALL_ROOT="$pkgdir/" install + + # zsh completion + install -Dm644 linux/completion/zsh_completion.sh \ + "$pkgdir/usr/share/zsh/site-functions/_$_pkgname" +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/qupzilla-libre/libre.patch b/libre/qupzilla-libre/libre.patch new file mode 100644 index 000000000..6db34dd8f --- /dev/null +++ b/libre/qupzilla-libre/libre.patch @@ -0,0 +1,89 @@ +diff --git a/src/lib/opensearch/searchenginesmanager.cpp b/src/lib/opensearch/searchenginesmanager.cpp +index 72ae7d4..cb42795 100644 +--- a/src/lib/opensearch/searchenginesmanager.cpp ++++ b/src/lib/opensearch/searchenginesmanager.cpp +@@ -55,8 +55,8 @@ SearchEnginesManager::SearchEnginesManager() + { + Settings settings; + settings.beginGroup("SearchEngines"); +- m_startingEngineName = settings.value("activeEngine", "Google").toString(); +- m_defaultEngineName = settings.value("DefaultEngine", "Google").toString(); ++ m_startingEngineName = settings.value("activeEngine", "DuckDuckGo HTML").toString(); ++ m_defaultEngineName = settings.value("DefaultEngine", "DuckDuckGo HTML").toString(); + settings.endGroup(); + + connect(this, SIGNAL(enginesChanged()), this, SLOT(scheduleSave())); +@@ -126,13 +126,6 @@ QUrl SearchEnginesManager::searchUrl(const QString &string) + + void SearchEnginesManager::restoreDefaults() + { +- Engine google; +- google.name = "Google"; +- google.icon = QIcon(":icons/sites/google.png"); +- google.url = "http://www.google.com/search?client=qupzilla&q=%s"; +- google.shortcut = "g"; +- google.suggestionsUrl = "http://suggestqueries.google.com/complete/search?output=firefox&q=%s"; +- + Engine wiki; + wiki.name = "Wikipedia (en)"; + wiki.icon = QIcon(":/icons/sites/wikipedia.png"); +@@ -140,25 +133,16 @@ void SearchEnginesManager::restoreDefaults() + wiki.shortcut = "w"; + wiki.suggestionsUrl = "http://en.wikipedia.org/w/api.php?action=opensearch&search=%s&namespace=0"; + +- Engine yt; +- yt.name = "YouTube"; +- yt.icon = QIcon(":/icons/sites/youtube.png"); +- yt.url = "http://www.youtube.com/results?search_query=%s&search=Search"; +- yt.shortcut = "yt"; +- yt.suggestionsUrl = "http://suggestqueries.google.com/complete/search?ds=yt&output=firefox&q=%s"; +- + Engine duck; +- duck.name = "DuckDuckGo"; ++ duck.name = "DuckDuckGo HTML"; + duck.icon = QIcon(":/icons/sites/duck.png"); +- duck.url = "https://duckduckgo.com/?q=%s&t=qupzilla"; ++ duck.url = "https://duckduckgo.com/html/?q=%s&t=qupzilla"; + duck.shortcut = "d"; + +- addEngine(google); + addEngine(wiki); +- addEngine(yt); + addEngine(duck); + +- m_defaultEngine = google; ++ m_defaultEngine = duck; + + emit enginesChanged(); + } +diff --git a/src/lib/plugins/speeddial.cpp b/src/lib/plugins/speeddial.cpp +index 2039921..52afa22 100644 +--- a/src/lib/plugins/speeddial.cpp ++++ b/src/lib/plugins/speeddial.cpp +@@ -54,11 +54,10 @@ void SpeedDial::loadSettings() + settings.endGroup(); + + if (allPages.isEmpty()) { +- allPages = "url:\"http://www.google.com\"|title:\"Google\";" ++ allPages = "url:\"https://duckduckgo.com/html\"|title:\"DuckDuckGo HTML\";" + "url:\"http://www.qupzilla.com\"|title:\"QupZilla\";" + "url:\"http://blog.qupzilla.com\"|title:\"QupZilla Blog\";" +- "url:\"https://github.com/QupZilla/qupzilla\"|title:\"QupZilla GitHub\";" +- "url:\"https://facebook.com\"|title:\"Facebook\";"; ++ "url:\"https://github.com/QupZilla/qupzilla\"|title:\"QupZilla GitHub\";"; + } + changed(allPages); + +diff --git a/src/lib/data/html/start.html b/src/lib/data/html/start.html +index 0e48ed2..eb7d793 100644 +--- a/src/lib/data/html/start.html ++++ b/src/lib/data/html/start.html +@@ -19,7 +19,7 @@ a {color: #1a4ba4;text-decoration: none;font-weight: bold;} + + <img src="%ABOUT-IMG%"> + %PRIVATE-BROWSING% +-<form action="https://duckduckgo.com/" method="GET"> ++<form action="https://duckduckgo.com/html" method="GET"> + <input type="hidden" name="t" value="qupzilla" /> + <input class="line" id="inp" class="question" name="q"/> <br/> + <input class="submit" type="submit" value="%BUTTON-LABEL%"> diff --git a/libre/qupzilla-libre/qupzilla.install b/libre/qupzilla-libre/qupzilla.install new file mode 100644 index 000000000..029294d67 --- /dev/null +++ b/libre/qupzilla-libre/qupzilla.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 2100f4781..075b584cc 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95105 2013-08-05 18:07:00Z tpowa $ +# $Id: PKGBUILD 95429 2013-08-12 07:16:37Z tpowa $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: xduugu # Contributor: nh2 @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=29 +pkgrel=30 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 4fcc9e0c4..09495f984 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95107 2013-08-05 18:07:47Z tpowa $ +# $Id: PKGBUILD 95431 2013-08-12 07:16:54Z tpowa $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20130607 _extramodules=extramodules-3.10-LIBRE -pkgrel=8 +pkgrel=9 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD index 6fae3ff41..0c46c87ea 100644 --- a/libre/webmin/PKGBUILD +++ b/libre/webmin/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 185708 2013-05-17 13:04:19Z tpowa $ +# $Id: PKGBUILD 192511 2013-08-13 11:01:17Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=webmin -pkgver=1.630 +pkgver=1.640 pkgrel=1 pkgdesc="a web-based interface for system administration (Parabola rebranded)" arch=(i686 x86_64 mips64el) @@ -210,7 +210,7 @@ package() { # install license install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE } -md5sums=('c52551ed405fcb67ea9d383ac6a32658' +md5sums=('d1d26e2df24be907e36bd1e63c1f41bf' 'b0b3e3fb231a12e60165b6b4d604dcfa' - 'bfebb75bb94029b48c46b7f1ba1aa811' - '458ef48fc471b70d38883753ec7211de') + 'c86518037449e0fc0c60fc24537ea038' + 'fc29ecb6a5cd8c278abe054e60381095') |