From f4e8283bcde80efd3e057defa14476a708c3d34d Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 22 Feb 2012 15:48:04 -0300 Subject: untracked patch --- .../linux-libre-xen/i915-fix-ghost-tv-output.patch | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch diff --git a/kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch b/kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch new file mode 100644 index 000000000..96654047b --- /dev/null +++ b/kernels/linux-libre-xen/i915-fix-ghost-tv-output.patch @@ -0,0 +1,27 @@ +Signed-off-by: Zhao Yakui +Tested-by: Santi +--- + drivers/gpu/drm/i915/intel_tv.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c +index dc83b7a..c8f67bf 100644 +--- a/drivers/gpu/drm/i915/intel_tv.c ++++ b/drivers/gpu/drm/i915/intel_tv.c +@@ -1267,6 +1267,15 @@ + DAC_B_0_7_V | + DAC_C_0_7_V); + ++ /* ++ * The TV sense state should be cleared to zero on cantiga platform. Otherwise ++ * the TV is misdetected. This is hardware requirement. ++ */ ++ if (IS_GM45(dev)) ++ tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL | ++ TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL); ++ ++ + I915_WRITE(TV_CTL, tv_ctl); + I915_WRITE(TV_DAC, tv_dac); + POSTING_READ(TV_DAC); + -- cgit v1.2.3-54-g00ecf From 4a327be44c87e40815c2080d6cfa47df975fa856 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 22 Feb 2012 17:10:31 -0300 Subject: libre/linux-libre-3.2.6-1 --- libre/linux-libre/PKGBUILD | 16 +------ libre/linux-libre/config.i686 | 81 ++++++++++++----------------------- libre/linux-libre/config.x86_64 | 78 +++++++++++---------------------- libre/linux-libre/linux-libre.install | 2 +- 4 files changed, 55 insertions(+), 122 deletions(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 8d2b6e9d1..c5a25d7c8 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -9,8 +9,8 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.2 -pkgver=${_basekernel}.5 -pkgrel=1 +pkgver=${_basekernel}.6 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -29,18 +29,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' 'i915-gpu-finish.patch') -md5sums=('27c641c4f6785fc647cdd3e44963a55c' - 'f81e60e49e4fb471f82ddfa2b8a8bd45' - '8116d2a3c35808f3fceece95d0b6ee96' - '92f62a90c1df8d74704a510d28146c52' - '576ba68b171efd4a3333736c30f334ef' - 'a8a3843046926eb7ab81312cd438c5c5' - '2967cecc3af9f954ccc822fd63dca6ff' - '8267264d9a8966e57fdacd1fa1fc65c4' - '04b21c79df0a952c22d681dd4f4562df' - '9d3c56a4b999c8bfbd4018089a62f662' - '263725f20c0b9eb9c353040792d644e5' - '4cd79aa147825837dc8bc9f6b736c0a0') build() { cd "${srcdir}/linux-${_basekernel}" diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 9aace04bc..da9104bdd 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.2.0 Kernel Configuration +# Linux/i386 3.2.6-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -722,7 +722,7 @@ CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=m +CONFIG_IPV6=y CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -3599,7 +3599,6 @@ CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_SAA7164=m CONFIG_VIDEO_CAFE_CCIC=m -CONFIG_VIDEO_VIA_CAMERA=m CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_IMX074=m CONFIG_SOC_CAMERA_MT9M001=m @@ -4014,7 +4013,7 @@ CONFIG_FB_SYS_IMAGEBLIT=m CONFIG_FB_SYS_FOPS=m # CONFIG_FB_WMT_GE_ROPS is not set CONFIG_FB_DEFERRED_IO=y -CONFIG_FB_SVGALIB=m +# CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set CONFIG_FB_BACKLIGHT=y CONFIG_FB_MODE_HELPERS=y @@ -4023,73 +4022,48 @@ CONFIG_FB_TILEBLITTING=y # # Frame buffer hardware drivers # -CONFIG_FB_CIRRUS=m -CONFIG_FB_PM2=m -CONFIG_FB_PM2_FIFO_DISCONNECT=y -CONFIG_FB_CYBER2000=m -CONFIG_FB_CYBER2000_DDC=y +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set # CONFIG_FB_ARC is not set # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set -# CONFIG_FB_VGA16 is not set +CONFIG_FB_VGA16=m CONFIG_FB_UVESA=m CONFIG_FB_VESA=y CONFIG_FB_EFI=y # CONFIG_FB_N411 is not set # CONFIG_FB_HGA is not set # CONFIG_FB_S1D13XXX is not set -CONFIG_FB_NVIDIA=m -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y -CONFIG_FB_RIVA=m -CONFIG_FB_RIVA_I2C=y -# CONFIG_FB_RIVA_DEBUG is not set -CONFIG_FB_RIVA_BACKLIGHT=y +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set CONFIG_FB_I810=m -# CONFIG_FB_I810_GTF is not set -CONFIG_FB_LE80578=m -CONFIG_FB_CARILLO_RANCH=m +CONFIG_FB_I810_GTF=y +CONFIG_FB_I810_I2C=y +# CONFIG_FB_LE80578 is not set # CONFIG_FB_MATROX is not set -CONFIG_FB_RADEON=m -CONFIG_FB_RADEON_I2C=y -CONFIG_FB_RADEON_BACKLIGHT=y -# CONFIG_FB_RADEON_DEBUG is not set -CONFIG_FB_ATY128=m -CONFIG_FB_ATY128_BACKLIGHT=y -CONFIG_FB_ATY=m -CONFIG_FB_ATY_CT=y -CONFIG_FB_ATY_GENERIC_LCD=y -CONFIG_FB_ATY_GX=y -CONFIG_FB_ATY_BACKLIGHT=y -CONFIG_FB_S3=m -CONFIG_FB_S3_DDC=y -CONFIG_FB_SAVAGE=m -CONFIG_FB_SAVAGE_I2C=y -CONFIG_FB_SAVAGE_ACCEL=y -CONFIG_FB_SIS=m -CONFIG_FB_SIS_300=y -CONFIG_FB_SIS_315=y -CONFIG_FB_VIA=m -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -CONFIG_FB_VIA_X_COMPATIBILITY=y -CONFIG_FB_NEOMAGIC=m -CONFIG_FB_KYRO=m -CONFIG_FB_3DFX=m -CONFIG_FB_3DFX_ACCEL=y -CONFIG_FB_3DFX_I2C=y +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_VIA is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set CONFIG_FB_VOODOO1=m -CONFIG_FB_VT8623=m -CONFIG_FB_TRIDENT=m +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set # CONFIG_FB_CARMINE is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_TMIO is not set # CONFIG_FB_SM501 is not set -CONFIG_FB_SMSCUFX=m +# CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m -# CONFIG_FB_VIRTUAL is not set +CONFIG_FB_VIRTUAL=m # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set # CONFIG_FB_BROADSHEET is not set @@ -4108,7 +4082,6 @@ CONFIG_LCD_AMS369FG06=m CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=m CONFIG_BACKLIGHT_PROGEAR=m -CONFIG_BACKLIGHT_CARILLO_RANCH=m CONFIG_BACKLIGHT_APPLE=m CONFIG_BACKLIGHT_SAHARA=m CONFIG_BACKLIGHT_WM831X=m @@ -5417,9 +5390,9 @@ CONFIG_PSTORE=y CONFIG_UFS_FS=m # CONFIG_UFS_FS_WRITE is not set # CONFIG_UFS_DEBUG is not set -CONFIG_ORE=m CONFIG_EXOFS_FS=m # CONFIG_EXOFS_DEBUG is not set +CONFIG_ORE=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m CONFIG_NFS_V3=y diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 42aafc2bb..5f8c3d003 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -684,7 +684,7 @@ CONFIG_DEFAULT_CUBIC=y # CONFIG_DEFAULT_RENO is not set CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=m +CONFIG_IPV6=y CONFIG_IPV6_PRIVACY=y CONFIG_IPV6_ROUTER_PREF=y CONFIG_IPV6_ROUTE_INFO=y @@ -3447,7 +3447,6 @@ CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CX18_ALSA=m CONFIG_VIDEO_SAA7164=m CONFIG_VIDEO_CAFE_CCIC=m -CONFIG_VIDEO_VIA_CAMERA=m CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_IMX074=m CONFIG_SOC_CAMERA_MT9M001=m @@ -3831,7 +3830,7 @@ CONFIG_VGASTATE=m CONFIG_VIDEO_OUTPUT_CONTROL=m CONFIG_FB=y CONFIG_FIRMWARE_EDID=y -CONFIG_FB_DDC=m +# CONFIG_FB_DDC is not set CONFIG_FB_BOOT_VESA_SUPPORT=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y @@ -3844,7 +3843,7 @@ CONFIG_FB_SYS_IMAGEBLIT=m CONFIG_FB_SYS_FOPS=m # CONFIG_FB_WMT_GE_ROPS is not set CONFIG_FB_DEFERRED_IO=y -CONFIG_FB_SVGALIB=m +# CONFIG_FB_SVGALIB is not set # CONFIG_FB_MACMODES is not set CONFIG_FB_BACKLIGHT=y CONFIG_FB_MODE_HELPERS=y @@ -3853,71 +3852,45 @@ CONFIG_FB_TILEBLITTING=y # # Frame buffer hardware drivers # -CONFIG_FB_CIRRUS=m -CONFIG_FB_PM2=m -CONFIG_FB_PM2_FIFO_DISCONNECT=y -CONFIG_FB_CYBER2000=m -CONFIG_FB_CYBER2000_DDC=y +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set # CONFIG_FB_ARC is not set # CONFIG_FB_ASILIANT is not set # CONFIG_FB_IMSTT is not set -# CONFIG_FB_VGA16 is not set +CONFIG_FB_VGA16=m CONFIG_FB_UVESA=m CONFIG_FB_VESA=y CONFIG_FB_EFI=y # CONFIG_FB_N411 is not set # CONFIG_FB_HGA is not set # CONFIG_FB_S1D13XXX is not set -CONFIG_FB_NVIDIA=m -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y -CONFIG_FB_RIVA=m -CONFIG_FB_RIVA_I2C=y -# CONFIG_FB_RIVA_DEBUG is not set -CONFIG_FB_RIVA_BACKLIGHT=y -CONFIG_FB_LE80578=m -CONFIG_FB_CARILLO_RANCH=m +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_LE80578 is not set # CONFIG_FB_MATROX is not set -CONFIG_FB_RADEON=m -CONFIG_FB_RADEON_I2C=y -CONFIG_FB_RADEON_BACKLIGHT=y -# CONFIG_FB_RADEON_DEBUG is not set -CONFIG_FB_ATY128=m -CONFIG_FB_ATY128_BACKLIGHT=y -CONFIG_FB_ATY=m -CONFIG_FB_ATY_CT=y -CONFIG_FB_ATY_GENERIC_LCD=y -CONFIG_FB_ATY_GX=y -CONFIG_FB_ATY_BACKLIGHT=y -CONFIG_FB_S3=m -CONFIG_FB_S3_DDC=y -CONFIG_FB_SAVAGE=m -CONFIG_FB_SAVAGE_I2C=y -CONFIG_FB_SAVAGE_ACCEL=y -CONFIG_FB_SIS=m -CONFIG_FB_SIS_300=y -CONFIG_FB_SIS_315=y -CONFIG_FB_VIA=m -# CONFIG_FB_VIA_DIRECT_PROCFS is not set -CONFIG_FB_VIA_X_COMPATIBILITY=y -CONFIG_FB_NEOMAGIC=m -CONFIG_FB_KYRO=m -CONFIG_FB_3DFX=m -CONFIG_FB_3DFX_ACCEL=y -CONFIG_FB_3DFX_I2C=y +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_VIA is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set CONFIG_FB_VOODOO1=m -CONFIG_FB_VT8623=m -CONFIG_FB_TRIDENT=m +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set # CONFIG_FB_CARMINE is not set # CONFIG_FB_GEODE is not set # CONFIG_FB_TMIO is not set # CONFIG_FB_SM501 is not set -CONFIG_FB_SMSCUFX=m +# CONFIG_FB_SMSCUFX is not set CONFIG_FB_UDL=m -# CONFIG_FB_VIRTUAL is not set +CONFIG_FB_VIRTUAL=m CONFIG_XEN_FBDEV_FRONTEND=m # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set @@ -3937,7 +3910,6 @@ CONFIG_LCD_AMS369FG06=m CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=m CONFIG_BACKLIGHT_PROGEAR=m -CONFIG_BACKLIGHT_CARILLO_RANCH=m CONFIG_BACKLIGHT_APPLE=m CONFIG_BACKLIGHT_SAHARA=m CONFIG_BACKLIGHT_WM831X=m @@ -5180,9 +5152,9 @@ CONFIG_PSTORE=y CONFIG_UFS_FS=m # CONFIG_UFS_FS_WRITE is not set # CONFIG_UFS_DEBUG is not set -CONFIG_ORE=m CONFIG_EXOFS_FS=m # CONFIG_EXOFS_DEBUG is not set +CONFIG_ORE=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m CONFIG_NFS_V3=y diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 58ad94d49..0869b9f9d 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.2.5-1-LIBRE +KERNEL_VERSION=3.2.6-2-LIBRE post_install () { # updating module dependencies -- cgit v1.2.3-54-g00ecf From 86cf7937351a7ae71431cb939ad107740481febb Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 28 Feb 2012 14:41:51 -0200 Subject: libre/icecat --- libre/icecat/PKGBUILD | 10 +++++++--- libre/icecat/libvpx.patch | 11 +++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 libre/icecat/libvpx.patch diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 718f03057..602ee3d5d 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -2,6 +2,7 @@ # Contributor: Figue # Contributor (Parabola): fauno # Contributor (Parabola): vando +# Contributor (Parabola): emulatorman # Thank you very much to the older contributors: # Contributor: evr # Contributor: Muhammad 'MJ' Jassim @@ -21,13 +22,13 @@ # * Disabled ContentHandlers and other Google/Yahoo! related services pkgname=icecat -pkgver=7.0.1 +pkgver=10.0 pkgrel=1 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!" arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'sqlite3' 'libnotify' 'desktop-file-utils' 'libvpx' 'libevent' 'hicolor-icon-theme') -makedepends=('p7zip-libre' 'zip' 'pkg-config' 'diffutils' 'python2-libre' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'libidl2' 'xorg-server-xvfb') +makedepends=('p7zip-libre' 'zip' 'unzip-libre' 'pkg-config' 'diffutils' 'python2-libre' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'libidl2' 'xorg-server-xvfb') options=(!buildflags !distcc) url="http://www.gnu.org/software/gnuzilla/" install=icecat.install @@ -37,6 +38,7 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz icecat-safe.desktop mozilla-firefox-1.0-lang.patch firefox-version.patch + libvpx.patch # Search engines internet-archive.xml jamendo-en.xml @@ -49,12 +51,13 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz # Default options firefox.js region.properties) -md5sums=('eb20dad67baeb5e71c5cfe469dbba378' +md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7' '927c3ac9ad0ba682e0ec9b66ed8cc4d3' 'e81ad01dbc16ba28bf92ba4b7c309ca7' 'd93fe402b87cd000a869e1fd6badc6c9' 'bd5db57c23c72a02a489592644f18995' 'ff4654144499faf630271cddc2261b7c' + 'e5d6c83b98d2d2ac69ff4d277702ff55' '462c68585461f8cdc23c93c46f6ee4cf' '2d492295c4308f9bba9ece28d8b3af2d' '937ac0e5392b060d93bd33e761fbfa51' @@ -71,6 +74,7 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}/" patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" + patch -Np1 -i "${srcdir}/libvpx.patch" # Solve missing reporter locales and preprocessor.pl cp --remove-destination ${srcdir}/Makefile.in ./browser/locales/ diff --git a/libre/icecat/libvpx.patch b/libre/icecat/libvpx.patch new file mode 100644 index 000000000..48b71c077 --- /dev/null +++ b/libre/icecat/libvpx.patch @@ -0,0 +1,11 @@ +--- icecat-10.0/configure.in.orig 2012-02-28 13:42:56.601961717 -0200 ++++ icecat-10.0/configure.in 2012-02-28 13:45:39.311963210 -0200 +@@ -5629,7 +5629,7 @@ + dnl v0.9.6 one to check for. + AC_TRY_COMPILE([ + #include +- #if !defined(VPX_CODEC_USE_INPUT_PARTITION) ++ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) + #error "test failed." + #endif + ], -- cgit v1.2.3-54-g00ecf From 18e02cf91227828c353543916ff2473d8adf3ddd Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 28 Feb 2012 14:52:10 -0200 Subject: libre/icecat --- libre/icecat/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 602ee3d5d..0c2159889 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -57,7 +57,7 @@ md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7' 'd93fe402b87cd000a869e1fd6badc6c9' 'bd5db57c23c72a02a489592644f18995' 'ff4654144499faf630271cddc2261b7c' - 'e5d6c83b98d2d2ac69ff4d277702ff55' + 'e5d6c83b98d2d2ac69ff4d277702ff55' '462c68585461f8cdc23c93c46f6ee4cf' '2d492295c4308f9bba9ece28d8b3af2d' '937ac0e5392b060d93bd33e761fbfa51' -- cgit v1.2.3-54-g00ecf From e9eb76be4c22af1be5c88ceaf15bf9798750c401 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 29 Feb 2012 03:39:04 -0200 Subject: libre/icecat --- libre/icecat/PKGBUILD | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 0c2159889..85a63f45f 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -57,7 +57,7 @@ md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7' 'd93fe402b87cd000a869e1fd6badc6c9' 'bd5db57c23c72a02a489592644f18995' 'ff4654144499faf630271cddc2261b7c' - 'e5d6c83b98d2d2ac69ff4d277702ff55' + 'e5d6c83b98d2d2ac69ff4d277702ff55' '462c68585461f8cdc23c93c46f6ee4cf' '2d492295c4308f9bba9ece28d8b3af2d' '937ac0e5392b060d93bd33e761fbfa51' @@ -83,15 +83,15 @@ build() { cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/ cp --remove-destination ${srcdir}/firefox.js ./browser/app/profile/ - cp "$srcdir/mozconfig" .mozconfig - patch -Np1 -i "$srcdir/mozilla-firefox-1.0-lang.patch" - patch -Np1 -i "$srcdir/firefox-version.patch" + cp "${srcdir}/mozconfig" .mozconfig + patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" + patch -Np1 -i "${srcdir}/firefox-version.patch" # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-7.0" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-${pkgver}" export PYTHON="/usr/bin/python2" LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & @@ -103,7 +103,7 @@ package() { ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR cd "${srcdir}/${pkgname}-${pkgver}/" - make -j1 -f client.mk DESTDIR="$pkgdir" install + make -j1 -f client.mk DESTDIR="${pkgdir}" install msg2 "Finishing..." install -m755 -d ${pkgdir}/usr/share/applications @@ -115,16 +115,16 @@ package() { cd ${pkgdir}/usr/lib ln -s ${ICECATDIR} icecat - rm -rf "$pkgdir"/usr/lib/icecat-7.0/{dictionaries,hyphenation} - ln -sf /usr/share/hunspell "$pkgdir/usr/lib/icecat-7.0/dictionaries" - ln -sf /usr/share/hyphen "$pkgdir/usr/lib/icecat-7.0/hyphenation" + rm -rf "${pkgdir}"/usr/lib/icecat-${pkgver}/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/icecat-${pkgver}/dictionaries" + ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/icecat-${pkgver}/hyphenation" # We don't want the development stuff - rm -r "$pkgdir"/usr/{include,lib/icecat-devel-$pkgver,share/idl} + rm -r "${pkgdir}"/usr/{include,lib/icecat-devel-$pkgver,share/idl} #workaround for now #https://bugzilla.mozilla.org/show_bug.cgi?id=658850 - ln -sf /usr/lib/icecat-7.0/icecat-bin "$pkgdir/usr/lib/icecat-7.0/icecat" + ln -sf /usr/lib/icecat-${pkgver}/icecat-bin "${pkgdir}/usr/lib/icecat-${pkgver}/icecat" msg2 "Removing proprietary and anti-privacy search engines" rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml -- cgit v1.2.3-54-g00ecf From 905a37901787967bf2513e8a9f2e72aaf4e5f37c Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 29 Feb 2012 03:40:57 -0200 Subject: libre/icecat --- libre/icecat/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 85a63f45f..7d6674f40 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -57,7 +57,7 @@ md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7' 'd93fe402b87cd000a869e1fd6badc6c9' 'bd5db57c23c72a02a489592644f18995' 'ff4654144499faf630271cddc2261b7c' - 'e5d6c83b98d2d2ac69ff4d277702ff55' + 'e5d6c83b98d2d2ac69ff4d277702ff55' '462c68585461f8cdc23c93c46f6ee4cf' '2d492295c4308f9bba9ece28d8b3af2d' '937ac0e5392b060d93bd33e761fbfa51' -- cgit v1.2.3-54-g00ecf From efc004d8df692dd7c5d7d29bf2da480a4827ea75 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 29 Feb 2012 11:49:49 -0200 Subject: libre/icecat --- libre/icecat/PKGBUILD | 10 ++++---- libre/icecat/firefox-install-dir.patch | 28 ++++++++++++++++++++++ libre/icecat/firefox-version.patch | 2 +- libre/icecat/libvpx.patch | 5 ++-- libre/icecat/mozconfig | 44 +++++++++++----------------------- 5 files changed, 52 insertions(+), 37 deletions(-) create mode 100644 libre/icecat/firefox-install-dir.patch diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 7d6674f40..9e237393f 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -38,6 +38,7 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz icecat-safe.desktop mozilla-firefox-1.0-lang.patch firefox-version.patch + firefox-install-dir.patch libvpx.patch # Search engines internet-archive.xml @@ -52,7 +53,7 @@ source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz firefox.js region.properties) md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7' - '927c3ac9ad0ba682e0ec9b66ed8cc4d3' + 'da4ed59ea64fe92fe326981a8efb3b75' 'e81ad01dbc16ba28bf92ba4b7c309ca7' 'd93fe402b87cd000a869e1fd6badc6c9' 'bd5db57c23c72a02a489592644f18995' @@ -65,14 +66,15 @@ md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7' '24528ca3f7f1e1a0ba735231aa3ac1de' 'c5f00b6b24222aacd5a749d1f59c4d24' 'e1bda0854de7d764f7401c81bb82b5ef' - 'ff83f1796ee13d3aec494649491d93cc' - '9952048383966926eea6d67384102425' - 'f1c76e7e244257856a386ca2de69bdf0') + '8f555198a7885f7d33d7525a101a6550' + '1e4bcac59e93d21fffa6a1d1ad235247' + '5d418ecdbdb9f40597df6b978b0b5ee5') build() { ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR cd "${srcdir}/${pkgname}-${pkgver}/" + patch -Np1 -i "$srcdir/firefox-install-dir.patch" patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" patch -Np1 -i "${srcdir}/libvpx.patch" diff --git a/libre/icecat/firefox-install-dir.patch b/libre/icecat/firefox-install-dir.patch new file mode 100644 index 000000000..b6f9700b3 --- /dev/null +++ b/libre/icecat/firefox-install-dir.patch @@ -0,0 +1,28 @@ +diff -Nur mozilla-release.orig/config/autoconf.mk.in mozilla-release/config/autoconf.mk.in +--- mozilla-release.orig/config/autoconf.mk.in 2011-11-06 14:06:44.462920048 +0000 ++++ mozilla-release/config/autoconf.mk.in 2011-11-06 14:20:45.124169469 +0000 +@@ -68,8 +68,8 @@ + mandir = @mandir@ + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + DIST = $(DEPTH)/dist + LIBXUL_SDK = @LIBXUL_SDK@ +diff -Nur mozilla-release.orig/js/src/config/autoconf.mk.in mozilla-release/js/src/config/autoconf.mk.in +--- mozilla-release.orig/js/src/config/autoconf.mk.in 2011-11-06 14:06:45.586263727 +0000 ++++ mozilla-release/js/src/config/autoconf.mk.in 2011-11-06 14:21:01.770993669 +0000 +@@ -61,8 +61,8 @@ + datadir = @datadir@ + mandir = @mandir@ + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + TOP_DIST = @TOP_DIST@ + ifneq (,$(filter /%,$(TOP_DIST))) diff --git a/libre/icecat/firefox-version.patch b/libre/icecat/firefox-version.patch index ab5dda540..8b2d74896 100644 --- a/libre/icecat/firefox-version.patch +++ b/libre/icecat/firefox-version.patch @@ -5,7 +5,7 @@ diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/bro include $(DEPTH)/config/autoconf.mk -+MOZ_APP_VERSION="7.0" ++MOZ_APP_VERSION="10.0" + include $(topsrcdir)/config/rules.mk diff --git a/libre/icecat/libvpx.patch b/libre/icecat/libvpx.patch index 48b71c077..f883b8e08 100644 --- a/libre/icecat/libvpx.patch +++ b/libre/icecat/libvpx.patch @@ -1,5 +1,6 @@ ---- icecat-10.0/configure.in.orig 2012-02-28 13:42:56.601961717 -0200 -+++ icecat-10.0/configure.in 2012-02-28 13:45:39.311963210 -0200 +diff -Nur mozilla-release.orig/configure.in mozilla-release/configure.in +--- mozilla-release.orig/configure.in 2012-02-05 16:01:35.722024142 +0000 ++++ mozilla-release/configure.in 2012-02-05 16:03:34.871064547 +0000 @@ -5629,7 +5629,7 @@ dnl v0.9.6 one to check for. AC_TRY_COMPILE([ diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index a5810e33a..da11f9faa 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -1,8 +1,9 @@ . $topsrcdir/browser/config/mozconfig -ac_add_options --disable-official-branding ac_add_options --prefix=/usr ac_add_options --libdir=/usr/lib + +# System libraries ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-system-jpeg @@ -13,53 +14,36 @@ ac_add_options --with-system-libevent ac_add_options --with-system-libvpx ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman ac_add_options --with-pthreads -ac_add_options --enable-default-toolkit=cairo-gtk2 +# Features +ac_add_options --disable-official-branding ac_add_options --disable-safe-browsing -ac_add_options --enable-extensions=default ac_add_options --enable-startup-notification -ac_add_options --enable-pango -ac_add_options --enable-svg -ac_add_options --enable-canvas -ac_add_options --enable-smil -ac_add_options --enable-canvas3d -ac_add_options --enable-places -ac_add_options --enable-url-classifier - -ac_add_options --enable-optimize -ac_add_options --enable-strip -ac_add_options --enable-install-strip -ac_add_options --enable-jemalloc -ac_add_options --enable-xterm-updates -ac_add_options --enable-printing -ac_add_options --enable-xinerama +ac_add_options --enable-gio +ac_add_options --enable-extensions=default ac_add_options --with-distribution-id=org.gnu.gnuzilla ac_add_options --with-user-appdir=.gnuzilla ac_add_options --with-branding=browser/branding/unofficial -ac_add_options --disable-javaxpcom +ac_add_options --disable-gnomevfs ac_add_options --disable-crashreporter ac_add_options --disable-updater ac_add_options --disable-tests ac_add_options --disable-mochitest -ac_add_options --disable-debug ac_add_options --disable-installer -ac_add_options --disable-pedantic -ac_add_options --disable-static -ac_add_options --enable-gio -ac_add_options --disable-gnomevfs -ac_add_options --enable-libnotify - -export BUILD_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 +# Optimization +ac_add_options --enable-optimize # PGO ac_add_options --enable-profile-guided-optimization mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 -- cgit v1.2.3-54-g00ecf From fa6b3bb7276a98f23b39be618bd930dc478ac13d Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 29 Feb 2012 12:12:35 -0200 Subject: libre/icecat --- libre/icecat/PKGBUILD | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 9e237393f..6628c2f9b 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -57,8 +57,9 @@ md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7' 'e81ad01dbc16ba28bf92ba4b7c309ca7' 'd93fe402b87cd000a869e1fd6badc6c9' 'bd5db57c23c72a02a489592644f18995' - 'ff4654144499faf630271cddc2261b7c' - 'e5d6c83b98d2d2ac69ff4d277702ff55' + '8f555198a7885f7d33d7525a101a6550' + '1e4bcac59e93d21fffa6a1d1ad235247' + '5d418ecdbdb9f40597df6b978b0b5ee5' '462c68585461f8cdc23c93c46f6ee4cf' '2d492295c4308f9bba9ece28d8b3af2d' '937ac0e5392b060d93bd33e761fbfa51' @@ -66,9 +67,9 @@ md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7' '24528ca3f7f1e1a0ba735231aa3ac1de' 'c5f00b6b24222aacd5a749d1f59c4d24' 'e1bda0854de7d764f7401c81bb82b5ef' - '8f555198a7885f7d33d7525a101a6550' - '1e4bcac59e93d21fffa6a1d1ad235247' - '5d418ecdbdb9f40597df6b978b0b5ee5') + 'ff83f1796ee13d3aec494649491d93cc' + '9952048383966926eea6d67384102425' + 'f1c76e7e244257856a386ca2de69bdf0') build() { ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR -- cgit v1.2.3-54-g00ecf From 173067d06723799eebb72a6a903a739833336425 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Thu, 1 Mar 2012 12:02:56 +0100 Subject: Package debootstrap from Trisquel, not building since it needs root priviledges. --- ~mtjm/debootstrap/PKGBUILD | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 ~mtjm/debootstrap/PKGBUILD diff --git a/~mtjm/debootstrap/PKGBUILD b/~mtjm/debootstrap/PKGBUILD new file mode 100644 index 000000000..8da48c3a0 --- /dev/null +++ b/~mtjm/debootstrap/PKGBUILD @@ -0,0 +1,30 @@ +# Maintainer: Michał Masłowski + +pkgname=debootstrap +_version=1.0.29 +_ubuntu=1 +_trisquel=5.0 +_trisquelrev=2 +pkgver=$_version.$_ubuntu.$_trisquel.$_trisquelrev +pkgrel=1 +pkgdesc="Bootstrap a basic Trisquel system" +arch=('any') +url="http://packages.trisquel.info/source/dagda/debootstrap" +license=('custom') +depends=('sh') +makedepends=('makedev') +backup=() +source=("http://archive.trisquel.info/trisquel/pool/main/d/debootstrap/debootstrap_${_version}ubuntu${_ubuntu}+${_trisquel}trisquel${_trisquelrev}.tar.gz") +md5sums=('22f8ddf5e11153c6fae8309a579e3376') + +package() { + cd "$srcdir/source" + sed -i 's;MAKEDEV := /sbin/MAKEDEV;MAKEDEV := /usr/sbin/MAKEDEV;' Makefile # fix Arch compatibility + sed -i 's; consoleonly;;' Makefile # doesn't work, not sure why + make all # not in build, since it needs root priviledges + make DESTDIR="$pkgdir/" install + install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname" + install -m644 debian/copyright "${pkgdir}/usr/share/licenses/$pkgname" +} + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From 7728e0207685ea5e0261794c73a9490e1621bee4 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 1 Mar 2012 15:22:36 -0200 Subject: libre/icecat --- libre/icecat/PKGBUILD | 207 ++++++++++++++++++++++------------------- libre/icecat/libre.patch | 66 +++++++++++++ libre/icecat/mozconfig | 29 +++--- libre/icecat/mozconfig.default | 63 +++++++++++++ libre/icecat/mozconfig.firefox | 46 +++++++++ libre/icecat/mozconfig.old | 78 ++++++++++++++++ libre/icecat/mozconfig.pgo | 4 + libre/icecat/vendor.js | 5 + 8 files changed, 389 insertions(+), 109 deletions(-) create mode 100644 libre/icecat/libre.patch create mode 100644 libre/icecat/mozconfig.default create mode 100644 libre/icecat/mozconfig.firefox create mode 100644 libre/icecat/mozconfig.old create mode 100644 libre/icecat/mozconfig.pgo create mode 100644 libre/icecat/vendor.js diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 6628c2f9b..79274ce21 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -1,137 +1,150 @@ -# Maintainer: Figue +# Contributor (ConnochaetOS): Henry Jensen +# Contributor (Parabola): Luke Shumaker # Contributor: Figue # Contributor (Parabola): fauno # Contributor (Parabola): vando # Contributor (Parabola): emulatorman +# Contributor (Arch): Jakub Schmidtke # Thank you very much to the older contributors: # Contributor: evr # Contributor: Muhammad 'MJ' Jassim -# Changelog -# =6.0 -# * Build with PGO support -# =3.6.13 -# * Installed Privacy Extension by default -# * DDG is now the default search engine -# =3.6.9 -# * Added libnotify as required by configure -# =3.6.7 -# * Added duckduckgo.com secure search engine -# =3.6.4 -# * Disabled SafeBrowsing until we find a non-google alternative (25/6/10) -# * Disabled ContentHandlers and other Google/Yahoo! related services - -pkgname=icecat +# If you are updating this package, don't forget to update the version number in +# the value for 'browser.dictionaries.download.url' in 'libre.patch' + +_pgo=false + +_pkgname=icecat pkgver=10.0 pkgrel=1 -pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!" + +if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi +if $_pgo; then + pkgname+='-pgo' +fi + +pkgdesc="The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!" arch=('i686' 'x86_64' 'mips64el') -license=('MPL' 'GPL' 'LGPL') -depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'sqlite3' 'libnotify' 'desktop-file-utils' 'libvpx' 'libevent' 'hicolor-icon-theme') -makedepends=('p7zip-libre' 'zip' 'unzip-libre' 'pkg-config' 'diffutils' 'python2-libre' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'libidl2' 'xorg-server-xvfb') -options=(!buildflags !distcc) +license=('GPL2' 'MPL' 'LGPL') +depends=( + 'alsa-lib' + 'dbus-glib' + 'desktop-file-utils' + 'gtk2' + 'hicolor-icon-theme' + 'hunspell' + 'libevent' + 'libnotify' + 'libvpx' + 'libxt' + 'mime-types' + 'mozilla-common' + 'mozilla-searchplugins' + 'nss>=3.13.1' + 'sqlite3' + 'startup-notification' +) +makedepends=( + 'autoconf2.13' + 'diffutils' + 'libidl2' + 'mesa' + 'pkg-config' + 'python2' + 'unzip' + 'wireless_tools' + 'yasm' + 'zip' +) +if $_pgo; then + makedepends+=('xorg-server-xvfb') + options=(!ccache) +fi + url="http://www.gnu.org/software/gnuzilla/" install=icecat.install source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver}/${pkgname}-${pkgver}.tar.xz mozconfig + mozconfig.pgo icecat.desktop icecat-safe.desktop - mozilla-firefox-1.0-lang.patch - firefox-version.patch + libre.patch firefox-install-dir.patch - libvpx.patch -# Search engines - internet-archive.xml - jamendo-en.xml - logless-search.xml - scroogle-ssl-english.xml - yacy.xml - duck-duck-go-ssl.xml - duck-duck-go-lite.xml - Makefile.in -# Default options - firefox.js - region.properties) -md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7' - 'da4ed59ea64fe92fe326981a8efb3b75' - 'e81ad01dbc16ba28bf92ba4b7c309ca7' - 'd93fe402b87cd000a869e1fd6badc6c9' - 'bd5db57c23c72a02a489592644f18995' - '8f555198a7885f7d33d7525a101a6550' - '1e4bcac59e93d21fffa6a1d1ad235247' - '5d418ecdbdb9f40597df6b978b0b5ee5' - '462c68585461f8cdc23c93c46f6ee4cf' - '2d492295c4308f9bba9ece28d8b3af2d' - '937ac0e5392b060d93bd33e761fbfa51' - 'cf97082e77e3ef5f1bd74b1db9329965' - '24528ca3f7f1e1a0ba735231aa3ac1de' - 'c5f00b6b24222aacd5a749d1f59c4d24' - 'e1bda0854de7d764f7401c81bb82b5ef' - 'ff83f1796ee13d3aec494649491d93cc' - '9952048383966926eea6d67384102425' - 'f1c76e7e244257856a386ca2de69bdf0') + vendor.js + libvpx.patch) -build() { - ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR - - cd "${srcdir}/${pkgname}-${pkgver}/" - patch -Np1 -i "$srcdir/firefox-install-dir.patch" - patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" - patch -Np1 -i "${srcdir}/libvpx.patch" +if [ "$_pkgname" != "$pkgname" ]; then + provides+=("$_pkgname") + conflicts+=("$_pkgname") +fi -# Solve missing reporter locales and preprocessor.pl - cp --remove-destination ${srcdir}/Makefile.in ./browser/locales/ +build() { + mv "$_pkgname-$pkgver" "$srcdir/mozilla-build" + cd "$srcdir/mozilla-build" -# Default prefs, remove Google stuff - cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/ - cp --remove-destination ${srcdir}/firefox.js ./browser/app/profile/ + cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch + patch -Np1 -i "$srcdir/firefox-install-dir.patch" # install to /usr/lib/$pkgname + patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff + patch -Np1 -i "$srcdir/libvpx.patch" # patch from Arch - cp "${srcdir}/mozconfig" .mozconfig - patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" - patch -Np1 -i "${srcdir}/firefox-version.patch" + if $_pgo; then + cat "$srcdir/mozconfig.pgo" >> .mozconfig + fi # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ - browser/base/Makefile.in + browser/base/Makefile.in - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/icecat-${pkgver}" + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" export PYTHON="/usr/bin/python2" - LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & - LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" - kill $! || true + if $_pgo; then + LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & + LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" + kill $! || true + else + LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" + fi } package() { - ICECATDIR="/usr/lib/${pkgname}-${pkgver}" && export ICECATDIR + cd "$srcdir/mozilla-build" + make -j1 -f client.mk DESTDIR="$pkgdir" install - cd "${srcdir}/${pkgname}-${pkgver}/" - make -j1 -f client.mk DESTDIR="${pkgdir}" install + install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref" - msg2 "Finishing..." - install -m755 -d ${pkgdir}/usr/share/applications - install -m755 -d ${pkgdir}/usr/share/pixmaps - install -m644 ${srcdir}/${pkgname}-${pkgver}/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/icecat.png - install -m644 ${srcdir}/icecat.desktop ${pkgdir}/usr/share/applications/ - install -m644 ${srcdir}/icecat-safe.desktop ${pkgdir}/usr/share/applications/ + brandingdir="browser/branding/unofficial" + icondir="$pkgdir/usr/share/icons/hicolor" + for i in 16x16 32x32 48x48; do + install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png" + done - cd ${pkgdir}/usr/lib - ln -s ${ICECATDIR} icecat + install -d "$pkgdir/usr/share/applications" + install -m644 "$srcdir/icecat.desktop" "$pkgdir/usr/share/applications" + install -m644 "$srcdir/icecat-safe.desktop" "$pkgdir/usr/share/applications" - rm -rf "${pkgdir}"/usr/lib/icecat-${pkgver}/{dictionaries,hyphenation} - ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/icecat-${pkgver}/dictionaries" - ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/icecat-${pkgver}/hyphenation" + rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation" + ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$_pkgname/plugins" + ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins" # We don't want the development stuff - rm -r "${pkgdir}"/usr/{include,lib/icecat-devel-$pkgver,share/idl} + rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} - #workaround for now - #https://bugzilla.mozilla.org/show_bug.cgi?id=658850 - ln -sf /usr/lib/icecat-${pkgver}/icecat-bin "${pkgdir}/usr/lib/icecat-${pkgver}/icecat" + # Fix a bug with https-everywhere (duplicate rules) + rm -f "$pkgdir/usr/lib/$pkgname/extensions/https-everywhere@eff.org/chrome/content/rules/GoogleMaps.xml~HEAD" - msg2 "Removing proprietary and anti-privacy search engines" - rm -f ${pkgdir}${ICECATDIR}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml - msg2 "And provide better ones..." - install -m755 -d ${pkgdir}${ICECATDIR}/searchplugins/ - install -m644 ${srcdir}/*.xml ${pkgdir}${ICECATDIR}/searchplugins/ + # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850 + ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin" } + +md5sums=('5a30f5c5422fb7c9b1a2d253028df9d7' + '6f3a8fd65c416216a1b56b0c2d2d81aa' + 'ac29b01c189f20abae2f3eef1618ffc0' + 'e81ad01dbc16ba28bf92ba4b7c309ca7' + 'd93fe402b87cd000a869e1fd6badc6c9' + '145f453ef82f643711c10d97ec57a805' + '1e4bcac59e93d21fffa6a1d1ad235247' + 'c382e35315047e4ca368d09383b39b8d' + '5d418ecdbdb9f40597df6b978b0b5ee5') diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch new file mode 100644 index 000000000..3dca93ee7 --- /dev/null +++ b/libre/icecat/libre.patch @@ -0,0 +1,66 @@ +--- icecat-9.0.1.orig/browser/app/profile/firefox.js 2011-12-26 23:11:39.000000000 -0500 ++++ icecat-9.0.1/browser/app/profile/firefox.js 2011-12-26 23:12:15.000000000 -0500 +@@ -74,7 +76,7 @@ + pref("extensions.update.autoUpdateDefault", true); + + // Dictionary download preference +-pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); ++pref("browser.dictionaries.download.url", "http://gnuzilla.gnu.org/download/langpacks/10.0/"); + + // The minimum delay in seconds for the timer to fire. + // default=2 minutes +@@ -876,7 +878,7 @@ + pref("browser.bookmarks.editDialog.firstEditField", "namePicker"); + + // base url for the wifi geolocation network provider +-pref("geo.wifi.uri", "https://www.google.com/loc/json"); ++pref("geo.wifi.uri", "http://geomena.org"); + pref("geo.wifi.protocol", 0); + + // Whether to use a panel that looks like an OS X sheet for customization +--- icecat-9.0.1.orig/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-26 07:34:23.000000000 -0500 ++++ icecat-9.0.1/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-26 19:59:04.000000000 -0500 +@@ -1,27 +1,19 @@ + # Default search engine +-browser.search.defaultenginename=Google ++browser.search.defaultenginename=Duck Duck Go (SSL) + + # Search engine order (order displayed in the search bar dropdown)s +-browser.search.order.1=Google +-browser.search.order.2=Yahoo ++browser.search.order.1=Duck Duck Go (SSL) ++browser.search.order.2=Duck Duck Go (Lite) + +-# This is the default set of web based feed handlers shown in the reader +-# selection UI +-browser.contentHandlers.types.0.title=Bloglines +-browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s +-browser.contentHandlers.types.1.title=My Yahoo +-browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s +-browser.contentHandlers.types.2.title=Google +-browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s + + # Keyword URL (for location bar searches) +-keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= ++keyword.URL=https://duckduckgo.com/?q= + + # URL for site-specific search engines + # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site + # to be searched and the user's search query. Place them in the appropriate location + # for your locale's URL but do not translate them. +-browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} ++browser.search.siteSearchURL=https://duckduckgo.com/?q=site%3A{moz:domain}+{searchTerms} + + # increment this number when anything gets changed in the list below. This will + # cause Firefox to re-read these prefs and inject any new handlers into the +--- icecat-9.0.1.orig/browser/app/Makefile.in 2011-12-27 00:22:26.000000000 -0500 ++++ icecat-9.0.1/browser/app/Makefile.in 2011-12-27 00:23:10.000000000 -0500 +@@ -269,7 +269,7 @@ + else + ifdef LIBXUL_SDK + libs:: +- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX) ++ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX) + endif + endif + diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index da11f9faa..b769079d8 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -20,14 +20,8 @@ ac_add_options --enable-system-pixman ac_add_options --with-pthreads # Features -ac_add_options --disable-official-branding -ac_add_options --disable-safe-browsing ac_add_options --enable-startup-notification ac_add_options --enable-gio -ac_add_options --enable-extensions=default -ac_add_options --with-distribution-id=org.gnu.gnuzilla -ac_add_options --with-user-appdir=.gnuzilla -ac_add_options --with-branding=browser/branding/unofficial ac_add_options --disable-gnomevfs ac_add_options --disable-crashreporter @@ -39,11 +33,22 @@ ac_add_options --disable-installer # Optimization ac_add_options --enable-optimize -# PGO -ac_add_options --enable-profile-guided-optimization -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' -mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' - export MOZILLA_OFFICIAL=1 mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir + +# IceCat +export MOZ_PHOENIX=1 +mk_add_options MOZ_PHOENIX=1 + +ac_add_options --disable-official-branding +ac_add_options --with-branding=browser/branding/unofficial +ac_add_options --with-distribution-id=org.gnu.gnuzilla +ac_add_options --with-user-appdir=.gnuzilla + +# Parabola +ac_add_options --disable-safe-browsing +export BUILD_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 + +# Build-generated diff --git a/libre/icecat/mozconfig.default b/libre/icecat/mozconfig.default new file mode 100644 index 000000000..01e047fc3 --- /dev/null +++ b/libre/icecat/mozconfig.default @@ -0,0 +1,63 @@ +# This is a better commented version of the default .mozconfig from 9.0.1 +ac_add_options --enable-application=browser + +ac_add_options --prefix=/usr/local +#ac_add_options --with-default-mozilla-five-home=/usr/local/lib + +# System libraries +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +#ac_add_options --with-system-png +ac_add_options --disable-system-cairo +#ac_add_options --with-pthreads + +ac_add_options --disable-toolkit-qt +ac_add_options --enable-toolkit-cairo-gtk2 +ac_add_options --enable-default-toolkit=cairo-gtk2 +ac_add_options --enable-svg-renderer=cairo + +# Features +ac_add_options --enable-extensions="default spellcheck" +ac_add_options --enable-freetype2 +ac_add_options --enable-pango +ac_add_options --enable-crypto +#ac_add_options --enable-postscript +ac_add_options --enable-svg +ac_add_options --enable-xft + +ac_add_options --disable-chatzilla +ac_add_options --disable-accessibility +ac_add_options --disable-calendar +ac_add_options --disable-composer + +#ac_add_options --disable-jsd +#ac_add_options --disable-libxul +ac_add_options --disable-ipc +ac_add_options --disable-ldap +ac_add_options --disable-mailnews +ac_add_options --disable-negotiateauth +ac_add_options --disable-profilesharing +ac_add_options --disable-xinerama +ac_add_options --disable-xprint + +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +ac_add_options --disable-debug + +# Optimization +ac_add_options --disable-elf-dynstr-gc +ac_add_options --enable-optimize="-pipe -O3" +ac_add_options --enable-strip + +# IceCat +export MOZ_PHOENIX=1 +mk_add_options MOZ_PHOENIX=1 + +ac_add_options --disable-official-branding +ac_add_options --with-branding=browser/branding/unofficial +ac_add_options --with-distribution-id=org.gnu.gnuzilla +ac_add_options --with-user-appdir=.gnuzilla diff --git a/libre/icecat/mozconfig.firefox b/libre/icecat/mozconfig.firefox new file mode 100644 index 000000000..428503642 --- /dev/null +++ b/libre/icecat/mozconfig.firefox @@ -0,0 +1,46 @@ +# This is the .mozconfig used by Arch for Firefox +. $topsrcdir/browser/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-official-branding +ac_add_options --enable-safe-browsing +ac_add_options --enable-startup-notification +ac_add_options --enable-gio + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +# Optimization +ac_add_options --enable-optimize + +# PGO +ac_add_options --enable-profile-guided-optimization +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 diff --git a/libre/icecat/mozconfig.old b/libre/icecat/mozconfig.old new file mode 100644 index 000000000..a790aee48 --- /dev/null +++ b/libre/icecat/mozconfig.old @@ -0,0 +1,78 @@ +# This is a better commented version of the .mozconfig used by the Parabola +# package < v9 +. $topsrcdir/browser/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-cairo +ac_add_options --with-pthreads + +ac_add_options --enable-default-toolkit=cairo-gtk2 + +# Features +ac_add_options --enable-extensions=default + +ac_add_options --enable-url-classifier +ac_add_options --enable-startup-notification +ac_add_options --enable-gio + +ac_add_options --enable-canvas +ac_add_options --enable-canvas3d +ac_add_options --enable-places +ac_add_options --enable-smil +ac_add_options --enable-svg + +ac_add_options --disable-javaxpcom +ac_add_options --enable-libnotify +ac_add_options --enable-printing +ac_add_options --enable-xinerama +ac_add_options --enable-xterm-updates + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-update +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +ac_add_options --disable-debug + +# Optimization +ac_add_options --disable-pedantic +ac_add_options --disable-static +ac_add_options --enable-install-strip +ac_add_options --enable-jemalloc +ac_add_options --enable-optimize +ac_add_options --enable-strip + +# PGO +ac_add_options --enable-profile-guided-optimization +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-pgo +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 + +# IceCat +ac_add_options --disable-official-branding +ac_add_options --with-branding=browser/branding/unofficial +ac_add_options --with-distribution-id=org.gnu.gnuzilla +ac_add_options --with-user-appdir=.gnuzilla + +# Parabola +ac_add_options --disable-safe-browsing +export BUILD_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo new file mode 100644 index 000000000..b0c249ebf --- /dev/null +++ b/libre/icecat/mozconfig.pgo @@ -0,0 +1,4 @@ +# PGO +ac_add_options --enable-profile-guided-optimization +mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' +mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo' diff --git a/libre/icecat/vendor.js b/libre/icecat/vendor.js new file mode 100644 index 000000000..808d1b118 --- /dev/null +++ b/libre/icecat/vendor.js @@ -0,0 +1,5 @@ +// Use LANG environment variable to choose locale +pref("intl.locale.matchOS", true); + +// Disable default browser checking. +pref("browser.shell.checkDefaultBrowser", false); -- cgit v1.2.3-54-g00ecf From 59b5ad860ea7f20e88a18fa4c777a9375a036ec8 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 1 Mar 2012 23:35:39 -0200 Subject: kernels/linux-libre-xen --- kernels/linux-libre-xen/PKGBUILD | 16 +++++--- kernels/linux-libre-xen/config.i686 | 2 +- kernels/linux-libre-xen/config.x86_64 | 2 +- kernels/linux-libre-xen/ext4-options.patch | 49 +++++++++++++++++++++++++ kernels/linux-libre-xen/linux-libre-xen.install | 2 +- 5 files changed, 63 insertions(+), 8 deletions(-) create mode 100644 kernels/linux-libre-xen/ext4-options.patch diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index c84aa9217..9b40c75d5 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -10,7 +10,7 @@ pkgname=('linux-libre-xen' 'linux-libre-xen-headers' 'linux-libre-xen-docs') # B # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.2 -pkgver=${_basekernel}.7 +pkgver=${_basekernel}.8 pkgrel=1 arch=('i686' 'x86_64') url="http://linux-libre.fsfla.org/" @@ -26,16 +26,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' - 'i915-gpu-finish.patch') + 'i915-gpu-finish.patch' + 'ext4-options.patch') md5sums=('27c641c4f6785fc647cdd3e44963a55c' '37a0fdc7ad19c9489faf09925b4fae5b' - 'a56e949b6c872d0d40ee3fd6969e0352' - '6685fcb15d021dff6e02667c60113577' + '1149b265c194f243c9249372602f0ac8' + 'e3a0f760de97df1f8852893507a0eef4' '67463f7a6e88305d7cd14a430e9efe92' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - '4cd79aa147825837dc8bc9f6b736c0a0') + '4cd79aa147825837dc8bc9f6b736c0a0' + 'c8299cf750a84e12d60b372c8ca7e1e8') build() { cd "${srcdir}/linux-${_basekernel}" @@ -63,6 +65,10 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + # fix ext4 module to mount ext3/2 correct + # https://bugs.archlinux.org/task/28653 + patch -Np1 -i "${srcdir}/ext4-options.patch" + cat "${srcdir}/config.${CARCH}" > ./.config # simpler if [ "${_kernelname}" != "" ]; then diff --git a/kernels/linux-libre-xen/config.i686 b/kernels/linux-libre-xen/config.i686 index 0e11985ee..b2a825481 100644 --- a/kernels/linux-libre-xen/config.i686 +++ b/kernels/linux-libre-xen/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.2.7-libre Kernel Configuration +# Linux/i386 3.2.8-libre Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/kernels/linux-libre-xen/config.x86_64 b/kernels/linux-libre-xen/config.x86_64 index 7bc5bd2e7..2899a7467 100644 --- a/kernels/linux-libre-xen/config.x86_64 +++ b/kernels/linux-libre-xen/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.2.7-libre Kernel Configuration +# Linux/x86_64 3.2.8-libre Kernel Configuration # CONFIG_64BIT=y # CONFIG_X86_32 is not set diff --git a/kernels/linux-libre-xen/ext4-options.patch b/kernels/linux-libre-xen/ext4-options.patch new file mode 100644 index 000000000..812b05f04 --- /dev/null +++ b/kernels/linux-libre-xen/ext4-options.patch @@ -0,0 +1,49 @@ +Report: https://bbs.archlinux.org/profile.php?id=33804 +Signed-off-by: Tom Gundersen +Cc: Thomas Baechler +Cc: Tobias Powalowski +Cc: Dave Reisner +--- + fs/ext4/super.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/fs/ext4/super.c b/fs/ext4/super.c +index 502c61f..30de9cd 100644 +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -1333,6 +1333,7 @@ enum { + Opt_inode_readahead_blks, Opt_journal_ioprio, + Opt_dioread_nolock, Opt_dioread_lock, + Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, ++ Opt_nocheck, Opt_reservation, Opt_noreservation, Opt_journal_inum, + }; + + static const match_table_t tokens = { +@@ -1408,6 +1409,10 @@ static const match_table_t tokens = { + {Opt_init_itable, "init_itable=%u"}, + {Opt_init_itable, "init_itable"}, + {Opt_noinit_itable, "noinit_itable"}, ++ {Opt_nocheck, "nocheck"}, ++ {Opt_reservation, "reservation"}, ++ {Opt_noreservation, "noreservation"}, ++ {Opt_journal_inum, "journal=%u"}, + {Opt_err, NULL}, + }; + +@@ -1904,6 +1909,16 @@ set_qf_format: + case Opt_noinit_itable: + clear_opt(sb, INIT_INODE_TABLE); + break; ++#ifdef CONFIG_EXT4_USE_FOR_EXT23 ++ case Opt_nocheck: ++ case Opt_reservation: ++ case Opt_noreservation: ++ case Opt_journal_inum: ++ ext4_msg(sb, KERN_WARNING, ++ "ext3 mount option \"%s\" ignored " ++ "by ext4 module", p); ++ break; ++#endif + default: + ext4_msg(sb, KERN_ERR, + "Unrecognized mount option \"%s\" " \ No newline at end of file diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 16b877724..b73d4aa77 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.2.7-1-LIBRE-XEN +KERNEL_VERSION=3.2.8-1-LIBRE-XEN post_install () { # updating module dependencies -- cgit v1.2.3-54-g00ecf From d7234d92f97bd7b06b1a74858d915908b28bf8ec Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 1 Mar 2012 23:52:47 -0200 Subject: kernels/linux-libre-xen --- kernels/linux-libre-xen/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 9b40c75d5..b9572d2ad 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -29,7 +29,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'i915-gpu-finish.patch' 'ext4-options.patch') md5sums=('27c641c4f6785fc647cdd3e44963a55c' - '37a0fdc7ad19c9489faf09925b4fae5b' + 'a97a83d5b003b3c9d87250e4eace45ce' '1149b265c194f243c9249372602f0ac8' 'e3a0f760de97df1f8852893507a0eef4' '67463f7a6e88305d7cd14a430e9efe92' -- cgit v1.2.3-54-g00ecf From 4f42d4ed83adc76a33de3bf6efdd600176ce2b98 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Fri, 2 Mar 2012 19:04:15 +0100 Subject: Update linux-libre to 3.2.9, don't fetch mips64el patches on non-mips64el. --- libre/linux-libre/PKGBUILD | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index e0220e8fd..d1ef7da22 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,7 +10,7 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.2 -pkgver=${_basekernel}.7 +pkgver=${_basekernel}.9 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -19,7 +19,6 @@ makedepends=('xmlto' 'docbook-xsl') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-libre/linux-${_basekernel}-libre.tar.xz" "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basekernel}-libre-${pkgver}-libre.xz" - "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -29,10 +28,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'boot-logo.patch' 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' - 'i915-gpu-finish.patch') + 'i915-gpu-finish.patch' + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2") md5sums=('27c641c4f6785fc647cdd3e44963a55c' - '37a0fdc7ad19c9489faf09925b4fae5b' - '690e6201d219638544d2fba3996dc822' + '8e601878ccdd37111cc84500ebd81387' '79db8a444fd149e409f706830d8cee9a' 'e26dbcb367a2b48f5ed09560e2ae8fa0' 'a8a3843046926eb7ab81312cd438c5c5' @@ -41,7 +40,13 @@ md5sums=('27c641c4f6785fc647cdd3e44963a55c' '04b21c79df0a952c22d681dd4f4562df' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' - '4cd79aa147825837dc8bc9f6b736c0a0') + '4cd79aa147825837dc8bc9f6b736c0a0' + '690e6201d219638544d2fba3996dc822') +if [ "$CARCH" != "mips64el" ]; then + # Don't use the Loongson-specific patches on non-mips64el arches. + unset source[${#source[@]}-1] + unset md5sums[${#md5sums[@]}-1] +fi build() { cd "${srcdir}/linux-${_basekernel}" -- cgit v1.2.3-54-g00ecf From b5e80d59e1fb5176ad49509ac042c035a2ad4a07 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 2 Mar 2012 16:35:05 -0200 Subject: libre/linux-libre --- libre/linux-libre/PKGBUILD | 7 +++++ libre/linux-libre/ext4-options.patch | 49 +++++++++++++++++++++++++++++++++++ libre/linux-libre/linux-libre.install | 2 +- 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 libre/linux-libre/ext4-options.patch diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index d1ef7da22..8838b8d9e 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -4,6 +4,7 @@ # Maintainer (Parabola): Nicolás Reynolds # Maintainer (Parabola): Sorin-Mihai Vârgolici # Maintainer (Parabola): André Silva +# Maintainer (Parabola): Michał Masłowski pkgbase=linux-libre pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel @@ -29,6 +30,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch' 'i915-gpu-finish.patch' + 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2") md5sums=('27c641c4f6785fc647cdd3e44963a55c' '8e601878ccdd37111cc84500ebd81387' @@ -41,6 +43,7 @@ md5sums=('27c641c4f6785fc647cdd3e44963a55c' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' '4cd79aa147825837dc8bc9f6b736c0a0' + 'f36222e7ce20c8e4dc27376f9be60f6c' '690e6201d219638544d2fba3996dc822') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. @@ -76,6 +79,10 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" + # fix ext4 module to mount ext3/2 correct + # https://bugs.archlinux.org/task/28653 + patch -Np1 -i "${srcdir}/ext4-options.patch" + if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile msg2 "Adding loongson-community patches" diff --git a/libre/linux-libre/ext4-options.patch b/libre/linux-libre/ext4-options.patch new file mode 100644 index 000000000..ef1b2417d --- /dev/null +++ b/libre/linux-libre/ext4-options.patch @@ -0,0 +1,49 @@ +Report: https://bbs.archlinux.org/profile.php?id=33804 +Signed-off-by: Tom Gundersen +Cc: Thomas Baechler +Cc: Tobias Powalowski +Cc: Dave Reisner +--- + fs/ext4/super.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/fs/ext4/super.c b/fs/ext4/super.c +index 502c61f..30de9cd 100644 +--- a/fs/ext4/super.c ++++ b/fs/ext4/super.c +@@ -1333,6 +1333,7 @@ enum { + Opt_inode_readahead_blks, Opt_journal_ioprio, + Opt_dioread_nolock, Opt_dioread_lock, + Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, ++ Opt_nocheck, Opt_reservation, Opt_noreservation, Opt_journal_inum, + }; + + static const match_table_t tokens = { +@@ -1408,6 +1409,10 @@ static const match_table_t tokens = { + {Opt_init_itable, "init_itable=%u"}, + {Opt_init_itable, "init_itable"}, + {Opt_noinit_itable, "noinit_itable"}, ++ {Opt_nocheck, "nocheck"}, ++ {Opt_reservation, "reservation"}, ++ {Opt_noreservation, "noreservation"}, ++ {Opt_journal_inum, "journal=%u"}, + {Opt_err, NULL}, + }; + +@@ -1904,6 +1909,16 @@ set_qf_format: + case Opt_noinit_itable: + clear_opt(sb, INIT_INODE_TABLE); + break; ++#ifdef CONFIG_EXT4_USE_FOR_EXT23 ++ case Opt_nocheck: ++ case Opt_reservation: ++ case Opt_noreservation: ++ case Opt_journal_inum: ++ ext4_msg(sb, KERN_WARNING, ++ "ext3 mount option \"%s\" ignored " ++ "by ext4 module", p); ++ break; ++#endif + default: + ext4_msg(sb, KERN_ERR, + "Unrecognized mount option \"%s\" " diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 6e3e16986..f05e87b9f 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.2.7-1-LIBRE +KERNEL_VERSION=3.2.9-1-LIBRE post_install () { # updating module dependencies -- cgit v1.2.3-54-g00ecf From ec25c0f30f1be10f66730306625f95a67b8ad4b4 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Fri, 2 Mar 2012 21:52:52 +0100 Subject: Support building linux-libre with older libre-lemote patches. --- libre/linux-libre/PKGBUILD | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 8838b8d9e..d09c44a5d 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -11,7 +11,9 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.2 -pkgver=${_basekernel}.9 +_sublevel=9 +pkgver=${_basekernel}.${_sublevel} +_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -31,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'i915-fix-ghost-tv-output.patch' 'i915-gpu-finish.patch' 'ext4-options.patch' - "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2") + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2") md5sums=('27c641c4f6785fc647cdd3e44963a55c' '8e601878ccdd37111cc84500ebd81387' '79db8a444fd149e409f706830d8cee9a' @@ -85,9 +87,11 @@ build() { if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile + sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ + < "${srcdir}/lxo-config.patch" > lxo-config.patch msg2 "Adding loongson-community patches" patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch - patch -Np0 -i "${srcdir}/lxo-config.patch" + patch -Np0 -i lxo-config.patch # ensure N32, add localversion and remove uevent helper as per # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README -- cgit v1.2.3-54-g00ecf From 6be2fb84fedb0602286ac30ce807d2894a189a9b Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Fri, 2 Mar 2012 23:21:49 +0100 Subject: mips64el kernel changes (untested). Have builtin USB storage support to enable booting the system from USB disks without initramfs (which would be very slow to load with PMON). Don't require mkinitcpio (issue #230). Install also an uncompressed kernel, oprofile needs it. --- libre/linux-libre/PKGBUILD | 23 ++++++++++++++++++----- libre/linux-libre/linux-libre.install | 12 ++++++++---- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index d09c44a5d..f31815bb3 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -93,12 +93,16 @@ build() { patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch patch -Np0 -i lxo-config.patch -# ensure N32, add localversion and remove uevent helper as per +# ensure N32, add localversion, remove uevent helper as per # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README - sed -i -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ +# and make USB storage support builtin (e.g. for booting from USB +# disks without slowly loading an initramfs) + sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \ - -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" ./.config + -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" \ + -e "s|(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*|\1=y|g" + ./.config else cat "${srcdir}/config.${CARCH}" > ./.config # simpler fi @@ -132,7 +136,9 @@ build() { # build! if [ "$CARCH" == "mips64el" ]; then - make ${MAKEFLAGS} vmlinuz modules + # bzImage is arch-specific and not supported on mips; vmlinux is + # useful for oprofile. + make ${MAKEFLAGS} vmlinux vmlinuz modules else make ${MAKEFLAGS} bzImage modules fi @@ -141,13 +147,19 @@ build() { package_linux-libre() { pkgdesc="The Linux-libre Kernel and modules" groups=('base') - depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7') + depends=('coreutils' 'module-init-tools>=3.16') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=$pkgver") conflicts=('kernel26' 'kernel26-libre' 'linux') replaces=('kernel26' 'kernel26-libre' 'linux') backup=("etc/mkinitcpio.d/${pkgname}.preset") install=${pkgname}.install + if [ "$CARCH" = "mips64el" ]; then + optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)') + conflicts+=('mkinitcpio<0.7') + else + depends+=('mkinitcpio>=0.7') + fi cd "${srcdir}/linux-${_basekernel}" @@ -162,6 +174,7 @@ package_linux-libre() { if [ "$CARCH" == "mips64el" ]; then cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgname}" + cp vmlinux "${pkgdir}/boot/vmlinux-${pkgname}" else cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgname}" fi diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index f05e87b9f..62f5d13bc 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -8,8 +8,10 @@ post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + if [ command -v mkinitcpio 2>&1 > /dev/null ]; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + fi # compat symlinks for the official kernels only if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; then @@ -50,8 +52,10 @@ post_upgrade() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." - mkinitcpio -p linux-libre${KERNEL_NAME} + if [ command -v mkinitcpio 2>&1 > /dev/null ]; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + fi } post_remove() { -- cgit v1.2.3-54-g00ecf From 62d9a0d6d90df36b4e490725c5c0fc429a3c7739 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 2 Mar 2012 21:05:36 -0200 Subject: libre/icecat-i18n --- libre/icecat-i18n/.gitignore | 3 + libre/icecat-i18n/PKGBUILD | 195 +++++++++++++++++++++--------------------- libre/icecat-i18n/PKGBUILD.in | 46 ++++++++++ 3 files changed, 148 insertions(+), 96 deletions(-) create mode 100644 libre/icecat-i18n/.gitignore create mode 100644 libre/icecat-i18n/PKGBUILD.in diff --git a/libre/icecat-i18n/.gitignore b/libre/icecat-i18n/.gitignore new file mode 100644 index 000000000..3987fdafb --- /dev/null +++ b/libre/icecat-i18n/.gitignore @@ -0,0 +1,3 @@ +index.html +langpacks.txt +*.xpi diff --git a/libre/icecat-i18n/PKGBUILD b/libre/icecat-i18n/PKGBUILD index 36a55c0e6..f995939da 100644 --- a/libre/icecat-i18n/PKGBUILD +++ b/libre/icecat-i18n/PKGBUILD @@ -1,23 +1,24 @@ -# Maintainer: fauno +# Maintainer: Luke Shumaker +# Contributor: fauno # Contributor: Figue +# Contributor: emulatorman # Based on firefox-i18n package # When updating to a newer upstream release: -# - run the two commands below to get list of language packs -# - change version in pkgver and _path -# - replace md5sums with output of makepkg -g +# - Edit variables in in Makefile. +# - (optionally) edit PKGBUILD.in +# - Run 'make'. It will take care of everything else for you. -# wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/ -# echo $(egrep -o '[^>".]+\.xpi' index.html | sort -u | sed 's/\.xpi//') _langpacks=(af ak ar ast be bg bn-BD bn-IN br bs ca cs cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu) pkgbase='icecat-i18n' pkgname=($(for lang in ${_langpacks[@]} do echo icecat-i18n-$lang | tr A-Z a-z done)) -pkgver=6.0 -pkgrel=2 -pkgdesc="Language packs for IceCat" +_pkgver=10.0 +pkgver=10.0 +pkgrel=1 +pkgdesc="Language packs for GNUzilla IceCat." arch=('any') license=('MPL') url="http://www.gnu.org/software/gnuzilla/" @@ -33,95 +34,97 @@ build() { cd "${srcdir}" } -_path="/usr/lib/icecat-6.0/extensions/" +_path="/usr/lib/icecat-$_pkgver/extensions/" for lang in ${_langpacks[@]} do - eval 'package_icecat-i18n-'$(echo $lang | tr A-Z a-z)'() { - install -Dm644 "'"$srcdir/$lang.xpi"'" "${pkgdir}'"${_path}langpack-$lang@firefox.mozilla.org.xpi"'" -}' + eval " +package_icecat-i18n-$(echo $lang | tr A-Z a-z) () { + install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi' +} +" done -md5sums=('591c7337853eedb77b86dede0c5bdf54' - '2b0c067f8387fb582b419dfca57d422e' - 'f3f6870d4b01bd64d80ac4de1db513f0' - 'd4f56954f7ad955481bda5503ecbc512' - '765d3c03355029434bbb65d121f67089' - '9e079762110ad2fcedc993bb87c44963' - '66a95194e65db2153e594fab871f5cd3' - '6ee12336d42c9ff23ec2b7864f44e38f' - '945f3c38961572b12148bc4f1c8bd283' - '9325c0178bff267cf4bb0583cf1d6c36' - '72c776ab5cd92cbaf7e3bda8d6f0d0d5' - '3e2a8386e6c56808a38ea749fd06d796' - '8a44d5a3c358bc510feccf917879baea' - '73574a44a75d52cfab87c3e10b2ebbb1' - '7486a690a30f348f07a2fec8478f3d1d' - '4c41dc44ff3e3b64e5a15aa2c1184660' - '6fde110c1244662eaf31d517ae2c9690' - 'b37ce2233807458f5b3835114f04c6df' - '8fa56995459873b5dcd03b06ee4a179c' - 'bfe86fdf0111d7d7d02fb689e197bdd3' - 'e97fe3f85ac1fc9c1c61edd56527ab25' - '5a51f4072f1c7f43832ac1c41a7135fd' - 'b13e8d2e54bbe35f9da43239cb4a2a16' - '71dd0c6257b419f986127db2600851a7' - '80a081a31a991fa63af8c26aebbaf8b3' - 'db7a91026ba03d4bfaadf23c4508ecf2' - 'a839ad07724553aefb76aa48c988ca3f' - 'b1e6859da4b078530fa00783c2fc8621' - '40abf8376133162a9f7c7ec44e5e06e6' - 'c4f62ffabe72ae87a096025998887bf9' - '1f58d2fbbaf449b4e05a83feddaa7f4e' - '9a54443791d8aa7004d085d79e4db1ea' - '948138c58a07b5fcb5c254bca5399e22' - '8889732de77e9e51bb43c744300a8b10' - 'fcc0c92d1c1aae27881cba21cd81d15c' - 'df3946f758bed44d30068bda21aa1af5' - 'e8b8fbc055f64c0b23a1c5c0ff21c603' - 'b358b06641cdfff8c8c500679aa632d3' - 'f7e67fa44a737f9b3a80abb9c3915ce5' - '2ee78734669c9e92a103db8c41614cca' - 'c0605e37d16869969b37b5936e28ff5e' - '51371731e61bc1369f47fd9ef263c63e' - '37eeb62381928a226472a916fec56844' - 'a22816fda39678927ca34437da1519b9' - 'd5910852f9ff4e142b5ad124f2135e59' - '3cbe3eb40bb57e6ff11d6377d966a8fc' - '64ce138c00140e553689d4265f018898' - 'c37d831b598ac6e5b0e3e49ec605ff7b' - '546deebbe1f27122ff21fbe85dd9ecfd' - '1bcacee0782d62298883426a41830531' - '69584792a5d7eba4ff80e85456d647c6' - '4515b31f20fd2f20bce55f4a1f6c0ec8' - '6357aeaf62d7867506c20b38bd2478a3' - '54da09a50365fea562b804b4cf2be2c4' - '0a8750cc238982882c7872edf2989341' - '136d2c2b747e7227207ed7dbb79b294e' - '43ae45dae8693c119a8cf703a0bb132a' - '3627b7ab8670a3741a48786df22ed2c0' - 'e4d3db69c334d1021b1982ab87a10d42' - '31c7e16225a379dc1fdabc211cd99079' - '142e02f1ab3db4f97b37adbf4e3a9138' - '617e895568a02588a168c54347f372e6' - '093b71d87d5e04311dab30b7a566d708' - 'e30278d7ac6ca5d09cb688420a221cc0' - '3ba61614b3ddbcf3dda18279e199afcd' - 'eaa1f41fa0ed45a5a3a0ab5b7b9e49d5' - '62999792ecd62689855651082d19d167' - '05a46c2dd966fd666f13e8db06441cf3' - 'fdf997b09ab54da41fccc590dba5201e' - 'bac1fc01d3bede7b4bb14a2290c33040' - '08c12984597bbe198329378fc59bacfb' - '587cb4938f8eac86e7ad05e7be4b0f9a' - '84914182cdb315e1a3a2062993f5cc00' - '15abeab9563a56bb0a061714f94bb1c5' - '05b190869d198992fda1624feb216a09' - '5885e96955025acf86f4186aaba5b794' - '37bddedad6898bac58987effeccadfad' - '49c0fbe9e0cbf66e24919eb99a612a43' - '9333d449ddbc8a3463d5aabacef39956' - 'ede65b0a4ba01afc53ba8035dc6a054c' - 'fe40e393535cc3106041592b626995f7' - 'a5941ca6a2271e0e1b4de3f9e7df5571' - '84da1f02c05066fe779e4813befc062e') +md5sums=('6d4c69921bbdfe92c0fd31873983d426' + '4e994c70c93e4d266d273d2358f7acf3' + 'd783c592edfa96d6abecd1efa1aa1b5e' + '70b8badcddb6d5cf6b226c0f0141b463' + 'bcfe52114b1c0f5346594452117bec5d' + '7d8900839fcf5972a91c4ce1a1bdd7c6' + 'd9720bf726a8f6fde0dc94e6e73863a9' + 'ce61734ab226dc041b55e95c9b6f9d92' + '965c2ec576ac41e7351e159f516ec65f' + '4feb78e0dd79606f416b8ab46432ad41' + '61989146fe89320c847e4de6261a06ff' + '260f3abb8612248493060e2dec6f0a22' + '6b49d830c47717001250236c9cc933a5' + '338137d425c8e6ae98796f3cc9a0550f' + '4ddf33cc1af9d3ad483d8fc47609aee3' + 'e04918865a21260b8eaf27b3dc84ade5' + '59961e347c4fe3816f809f456bc9a2b8' + '262ad46f6c6e8a89eb29b590cc092eb9' + 'e9452d83d914605f06c055c00325bf6b' + 'ae652d7db9b3cd3cba85306d16a7a599' + '04fec5cd927a57ac6c9780a9f42444e1' + '70ba3ec972f01e75b144e106afacd8ac' + 'f1ee7deccf3c73083b51c5741722b120' + 'ca5566a24ee4fd38a3a907bfb5d72975' + 'd4717e5c3e44fbaebe4eaf99f0195120' + '907c42bdaa3af02c39bef5d83198f8a9' + '7afa1ac8645657722cdf3415244e4686' + 'd3d780b6c8d179c68065d9bec19dce48' + '09fae6ea53f5435ccfdbf41f660378ee' + '043306182ec497280b3ea78dcbd7b7d3' + '8a481d0d41f22d5bc65ed7844a0d7c27' + '2a8648998f2aafd307511e043cd8564d' + 'e7fbc4b7364d151edac9840b90949f56' + 'e2ea49277375825f612bcfb225dcb0a0' + '9fb2a20a2222a0d814a3f48d7208d820' + '88976bac6b9e647f4d17ab1638f12601' + 'a6a39406914459deaefb3403e94dfa39' + 'd3acecff63909d946fb549520785ef99' + 'a8327a1a525330ca9ef8e3f9d50ca5f8' + 'ba3ad9e8843b0de408a72896183985d6' + '3dfb48ecea5eda9f0e3e05295eb3c82b' + '95a1e7e2ec604409b54f1ded4ee7accf' + '69ebeb59c7ff4e0452c9f0998db65ef0' + '7bdf97288cef0d14ff1521db063cd20c' + '8f50cfa1e8c788b7b839273848dc2834' + '3aa0631dc6a53581cf53d559b27a0ee3' + '45e7238e0d0e427df04d3ba91ca045cd' + 'b992cfa2b0440486cd70fd6ab9e32deb' + '3a9fac821e039556f7d009080daec643' + '6872abed4f4d4b81cf5f0b7b656846c7' + 'eb44e902c6a6186c85dca8aff1d5b95f' + '21f5aeacbb233167218ab7f1b34efdce' + 'b97e29d866ae1ed422d0a1c4327cfd49' + '5cce41015e73c36944224f827ac5a8d1' + 'a13ac7293acc75015f0034d77ddb0f30' + '38c84e214af65ed6f059ad524c923dc9' + '66c8d82875f55f67167048e3d6888d8f' + '4ec423b8e34a4de058b115fd5918e0b2' + '0026e20db1bad1eaf692bd0b2043c038' + '31f029a6665ccae9b4c8cac9eda06c6f' + 'e72ffe020543ca0ad4f8be2aad9e90a9' + '7b75e8fb1cd8ae34023b312d2214029a' + '88b1a96268e08f65579b2fe6d7677b73' + '4418d687e4dcb313fd59247844eab93c' + 'b200a045163b7c09cde85b82013fec98' + '263f6ff19491b68865bcab4309dff0a8' + '80d0fb352eb1f252c355d3b8388d3513' + 'dd79b0c4d959f46852e1e23b0cc984af' + 'db51a6767331bb3a8c0a1e0f5f35d968' + '3155d4cafe5f90ec83336ddd07183629' + 'b9246693498e1ec3c5b4dffa8145d04e' + '770bf78f2a0c6522e641e61e44617b40' + 'aadf3a6f9517c76e2b37867cb1a654c6' + '3530c75b3c2311d8127f20df7bd724da' + 'ef3bfc5db8197edb095da10390d8e058' + '46b701b2db7415b30b82023bb707e1dc' + '24da3bee4042e31da5781b02dc089499' + 'b3faadcabfd6d738a41ee4c12696adcd' + '9938f231ce13202d040c24783c95c35b' + '04894f460b81525d29367f1ed1504f5e' + 'c6049613b48eaaa71c45df2e44db1087' + '7e7e81ca9c6d44913d37159b4627967c' + '1a80a20da9cc26e2edd942d77a35c824') diff --git a/libre/icecat-i18n/PKGBUILD.in b/libre/icecat-i18n/PKGBUILD.in new file mode 100644 index 000000000..90c901e31 --- /dev/null +++ b/libre/icecat-i18n/PKGBUILD.in @@ -0,0 +1,46 @@ +# Maintainer: Luke Shumaker +# Contributor: fauno +# Contributor: Figue +# 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=@LANGPACKS@ + +pkgbase='icecat-i18n' +pkgname=($(for lang in ${_langpacks[@]} + do echo icecat-i18n-$lang | tr A-Z a-z + done)) +_pkgver=@_PKGVER@ +pkgver=@PKGVER@ +pkgrel=@PKGREL@ +pkgdesc="Language packs for GNUzilla IceCat." +arch=('any') +license=('MPL') +url="http://www.gnu.org/software/gnuzilla/" +depends=("icecat=${pkgver}") +source=($(for lang in ${_langpacks[@]} + do echo http://gnuzilla.gnu.org/download/langpacks/$pkgver/$lang.xpi + done)) +noextract=($(for lang in ${_langpacks[@]} + do echo $lang.xpi + done)) + +build() { + cd "${srcdir}" +} + +_path="/usr/lib/icecat-$_pkgver/extensions/" + +for lang in ${_langpacks[@]} +do + eval " +package_icecat-i18n-$(echo $lang | tr A-Z a-z) () { + install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi' +} +" +done + -- cgit v1.2.3-54-g00ecf From 458e8bb98a9ad3661629d65e93caa046b179cd1a Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 2 Mar 2012 21:42:27 -0200 Subject: libre/icecat-i18n --- libre/icecat-i18n/.directory | 2 ++ libre/icecat-i18n/Makefile | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 libre/icecat-i18n/.directory create mode 100644 libre/icecat-i18n/Makefile diff --git a/libre/icecat-i18n/.directory b/libre/icecat-i18n/.directory new file mode 100644 index 000000000..98ec279ed --- /dev/null +++ b/libre/icecat-i18n/.directory @@ -0,0 +1,2 @@ +[Dolphin] +Timestamp=2012,3,2,21,19,19 diff --git a/libre/icecat-i18n/Makefile b/libre/icecat-i18n/Makefile new file mode 100644 index 000000000..d1aaf7bff --- /dev/null +++ b/libre/icecat-i18n/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 -- cgit v1.2.3-54-g00ecf From e18dda04be106dc01c23173810b8657d517ba3c3 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 3 Mar 2012 03:11:46 -0200 Subject: libre/linux-libre --- libre/linux-libre/PKGBUILD | 39 +++++++++++---------------------------- libre/linux-libre/config.i686 | 2 +- libre/linux-libre/config.x86_64 | 2 +- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index f31815bb3..602f7b1db 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -11,10 +11,8 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock - # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.2 -_sublevel=9 -pkgver=${_basekernel}.${_sublevel} -_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver -pkgrel=1 +pkgver=${_basekernel}.9 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -33,11 +31,11 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'i915-fix-ghost-tv-output.patch' 'i915-gpu-finish.patch' 'ext4-options.patch' - "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2") + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2") md5sums=('27c641c4f6785fc647cdd3e44963a55c' '8e601878ccdd37111cc84500ebd81387' - '79db8a444fd149e409f706830d8cee9a' - 'e26dbcb367a2b48f5ed09560e2ae8fa0' + '921f108c7a4985f7f8b41d72ca9bf915' + 'f18ac3f790b0daa43f21dda04cceb90b' 'a8a3843046926eb7ab81312cd438c5c5' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -87,22 +85,16 @@ build() { if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile - sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ - < "${srcdir}/lxo-config.patch" > lxo-config.patch msg2 "Adding loongson-community patches" patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch - patch -Np0 -i lxo-config.patch + patch -Np0 -i "${srcdir}/lxo-config.patch" -# ensure N32, add localversion, remove uevent helper as per +# ensure N32, add localversion and remove uevent helper as per # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README -# and make USB storage support builtin (e.g. for booting from USB -# disks without slowly loading an initramfs) - sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ + sed -i -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \ - -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" \ - -e "s|(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*|\1=y|g" - ./.config + -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" ./.config else cat "${srcdir}/config.${CARCH}" > ./.config # simpler fi @@ -136,9 +128,7 @@ build() { # build! if [ "$CARCH" == "mips64el" ]; then - # bzImage is arch-specific and not supported on mips; vmlinux is - # useful for oprofile. - make ${MAKEFLAGS} vmlinux vmlinuz modules + make ${MAKEFLAGS} vmlinuz modules else make ${MAKEFLAGS} bzImage modules fi @@ -147,19 +137,13 @@ build() { package_linux-libre() { pkgdesc="The Linux-libre Kernel and modules" groups=('base') - depends=('coreutils' 'module-init-tools>=3.16') + depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=$pkgver") conflicts=('kernel26' 'kernel26-libre' 'linux') replaces=('kernel26' 'kernel26-libre' 'linux') backup=("etc/mkinitcpio.d/${pkgname}.preset") install=${pkgname}.install - if [ "$CARCH" = "mips64el" ]; then - optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)') - conflicts+=('mkinitcpio<0.7') - else - depends+=('mkinitcpio>=0.7') - fi cd "${srcdir}/linux-${_basekernel}" @@ -174,7 +158,6 @@ package_linux-libre() { if [ "$CARCH" == "mips64el" ]; then cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgname}" - cp vmlinux "${pkgdir}/boot/vmlinux-${pkgname}" else cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgname}" fi diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index d2d688197..5a50c4e04 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -4053,7 +4053,7 @@ CONFIG_FB_I810_I2C=y # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set CONFIG_FB_VOODOO1=m -# CONFIG_FB_VT8623 is not set +CONFIG_FB_VT8623=m # CONFIG_FB_TRIDENT is not set # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 80ea3030f..441d23e6f 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -3880,7 +3880,7 @@ CONFIG_FB_EFI=y # CONFIG_FB_KYRO is not set # CONFIG_FB_3DFX is not set CONFIG_FB_VOODOO1=m -# CONFIG_FB_VT8623 is not set +CONFIG_FB_VT8623=m # CONFIG_FB_TRIDENT is not set # CONFIG_FB_ARK is not set # CONFIG_FB_PM3 is not set -- cgit v1.2.3-54-g00ecf From 00a5e5367fde6bec72e6aeae7992654676a61b09 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 3 Mar 2012 03:32:13 -0200 Subject: libre/linux-libre --- libre/linux-libre/PKGBUILD | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 602f7b1db..135fb3839 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,8 +10,9 @@ pkgbase=linux-libre pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} -_basekernel=3.2 -pkgver=${_basekernel}.9 +_sublevel=9 +pkgver=${_basekernel}.${_sublevel} +_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -31,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li 'i915-fix-ghost-tv-output.patch' 'i915-gpu-finish.patch' 'ext4-options.patch' - "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${pkgver}-libre-lemote_0lxo_mipsel.tar.bz2") + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-libre-lemote_0lxo_mipsel.tar.bz2") md5sums=('27c641c4f6785fc647cdd3e44963a55c' '8e601878ccdd37111cc84500ebd81387' '921f108c7a4985f7f8b41d72ca9bf915' @@ -85,16 +86,22 @@ build() { if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile + sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ + < "${srcdir}/lxo-config.patch" > lxo-config.patch msg2 "Adding loongson-community patches" patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch - patch -Np0 -i "${srcdir}/lxo-config.patch" + patch -Np0 -i lxo-config.patch -# ensure N32, add localversion and remove uevent helper as per +# ensure N32, add localversion, remove uevent helper as per # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README - sed -i -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ +# and make USB storage support builtin (e.g. for booting from USB +# disks without slowly loading an initramfs) + sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \ - -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" ./.config + -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" \ + -e "s|(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*|\1=y|g" + ./.config else cat "${srcdir}/config.${CARCH}" > ./.config # simpler fi @@ -128,7 +135,9 @@ build() { # build! if [ "$CARCH" == "mips64el" ]; then - make ${MAKEFLAGS} vmlinuz modules + # bzImage is arch-specific and not supported on mips; vmlinux is + # useful for oprofile. + make ${MAKEFLAGS} vmlinux vmlinuz modules else make ${MAKEFLAGS} bzImage modules fi @@ -137,13 +146,19 @@ build() { package_linux-libre() { pkgdesc="The Linux-libre Kernel and modules" groups=('base') - depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7') + depends=('coreutils' 'module-init-tools>=3.16') optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=$pkgver") conflicts=('kernel26' 'kernel26-libre' 'linux') replaces=('kernel26' 'kernel26-libre' 'linux') backup=("etc/mkinitcpio.d/${pkgname}.preset") install=${pkgname}.install + if [ "$CARCH" = "mips64el" ]; then + optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)') + conflicts+=('mkinitcpio<0.7') + else + depends+=('mkinitcpio>=0.7') + fi cd "${srcdir}/linux-${_basekernel}" @@ -158,6 +173,7 @@ package_linux-libre() { if [ "$CARCH" == "mips64el" ]; then cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgname}" + cp vmlinux "${pkgdir}/boot/vmlinux-${pkgname}" else cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgname}" fi -- cgit v1.2.3-54-g00ecf From 763b77b398c9a6889616be6f2cafa29f76c1c9ab Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 3 Mar 2012 03:40:15 -0200 Subject: libre/linux-libre --- libre/linux-libre/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 135fb3839..c9a93613f 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,6 +10,7 @@ pkgbase=linux-libre pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -LIBRE kernel # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} +_basekernel=3.2 _sublevel=9 pkgver=${_basekernel}.${_sublevel} _lxopkgver=${_basekernel}.7 # nearly always the same as pkgver -- cgit v1.2.3-54-g00ecf From 97991fe0aededc07fcf29dc41b184261b7599c44 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Sat, 3 Mar 2012 12:11:08 -0300 Subject: social/uci-0.8.0-1 --- social/uci/PKGBUILD | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 social/uci/PKGBUILD diff --git a/social/uci/PKGBUILD b/social/uci/PKGBUILD new file mode 100644 index 000000000..51c3ba0e0 --- /dev/null +++ b/social/uci/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Nicolás Reynolds +pkgname=uci +pkgver=0.8.0 +pkgrel=1 +pkgdesc="OpenWRT's Unified Configuration Interface" +arch=('i686') +url="https://openwrt.org" +license=('GPL2') +makedepends=('git' 'cmake' 'lua') +source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz) +md5sums=('135bf6c4188b72c7fd7954f592b1e4e4') + +# source PKGBUILD; mksource +mksource() { + + if [ -d uci/.git ]; then + pushd uci; git pull; popd + else + git clone git://nbd.name/uci.git + fi + + cd uci/ + git archive --prefix=${pkgname}-${pkgver}/ v${pkgver} | \ + gzip -9 > ../${pkgname}-${pkgver}.tar.gz + cd .. +} + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + cmake . + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir}/ install +} + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From 23ee1a2c83a8c3443f5086c30619856046b77158 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sat, 3 Mar 2012 18:01:49 +0100 Subject: More linux-libre build fixes. --- libre/linux-libre/PKGBUILD | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index f31815bb3..b72066ccd 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -101,7 +101,7 @@ build() { -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \ -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"-LIBRE\"|g" \ - -e "s|(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*|\1=y|g" + -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \ ./.config else cat "${srcdir}/config.${CARCH}" > ./.config # simpler @@ -136,6 +136,9 @@ build() { # build! if [ "$CARCH" == "mips64el" ]; then + # The build system passes it directly to linker, disable to avoid + # having unknown -Wl,... options. + export LDFLAGS="" # bzImage is arch-specific and not supported on mips; vmlinux is # useful for oprofile. make ${MAKEFLAGS} vmlinux vmlinuz modules @@ -226,7 +229,7 @@ package_linux-libre-headers() { # In case of repackaging this is empty if [ -z "${_kernver}" ]; then - cd ${srcdir}/linux-$pkgver + cd "${srcdir}/linux-${_basekernel}" _kernver="$(make kernelrelease)" fi @@ -260,7 +263,7 @@ package_linux-libre-headers() { if [ "$CARCH" = "mips64el" ]; then cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" - cp "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/" fi -- cgit v1.2.3-54-g00ecf From 433dba14d4671c511488c56e5f85599cb43fd1f1 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sat, 3 Mar 2012 19:21:46 +0100 Subject: Fix typos in linux-libre.install. --- libre/linux-libre/linux-libre.install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 62f5d13bc..ea00c881c 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -8,7 +8,7 @@ post_install () { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - if [ command -v mkinitcpio 2>&1 > /dev/null ]; then + if command -v mkinitcpio 2>&1 > /dev/null; then echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." mkinitcpio -p linux-libre${KERNEL_NAME} fi @@ -52,7 +52,7 @@ post_upgrade() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." depmod ${KERNEL_VERSION} - if [ command -v mkinitcpio 2>&1 > /dev/null ]; then + if command -v mkinitcpio 2>&1 > /dev/null; then echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." mkinitcpio -p linux-libre${KERNEL_NAME} fi -- cgit v1.2.3-54-g00ecf From 5469116bb15a9e5573fdf70af8511c8dce1e201d Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sat, 3 Mar 2012 20:16:12 +0100 Subject: uci builds on mips64el. --- social/uci/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/social/uci/PKGBUILD b/social/uci/PKGBUILD index 51c3ba0e0..d306b77bd 100644 --- a/social/uci/PKGBUILD +++ b/social/uci/PKGBUILD @@ -3,7 +3,7 @@ pkgname=uci pkgver=0.8.0 pkgrel=1 pkgdesc="OpenWRT's Unified Configuration Interface" -arch=('i686') +arch=('i686' 'mips64el') url="https://openwrt.org" license=('GPL2') makedepends=('git' 'cmake' 'lua') -- cgit v1.2.3-54-g00ecf From 348d8bab3411165a40913ee87282acad11473bab Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sun, 4 Mar 2012 18:36:04 +0100 Subject: Remove ffmpeg-libre since ffmpeg is newer and free. --- libre/ffmpeg-libre/PKGBUILD | 57 --------------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 libre/ffmpeg-libre/PKGBUILD diff --git a/libre/ffmpeg-libre/PKGBUILD b/libre/ffmpeg-libre/PKGBUILD deleted file mode 100644 index 41c332dca..000000000 --- a/libre/ffmpeg-libre/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 85265 2010-07-11 10:15:18Z ibiru $ -# Maintainer : Ionut Biru -# Contributor: Tom Newsom -# Contributor: Paul Mattal -# Maintainer for Parabola GNU/Linux: Omar Botta - -pkgname=ffmpeg-libre -pkgver=20110330 -pkgrel=1 -pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix. Libre version without faac" -arch=('i686' 'x86_64') -url="http://ffmpeg.org/" -license=('GPL') -depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg') -makedepends=('yasm' 'git') -#git clone git://git.videolan.org/ffmpeg.git -source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-${pkgver}.tar.xz) -md5sums=('dd682a876a496b9f9ae8afb3b3b70389') -#source=(http://ffmpeg.org/releases//releases/ffmpeg-${pkgver}.tar.bz2) -provides=("ffmpeg=$pkgver") -conflicts=('ffmpeg') -replaces=('ffmpeg') - -build() { - cd "$srcdir/${pkgname%-libre}" - - ./configure \ - --prefix=/usr \ - --enable-gpl \ - --enable-libmp3lame \ - --enable-libvorbis \ - --disable-libfaac \ - --enable-libxvid \ - --enable-libx264 \ - --enable-libvpx \ - --enable-libtheora \ - --enable-postproc \ - --enable-shared \ - --enable-x11grab \ - --enable-libopencore_amrnb \ - --enable-libopencore_amrwb \ - --enable-libschroedinger \ - --enable-libopenjpeg \ - --enable-version3 \ - --disable-nonfree \ - --enable-runtime-cpudetect \ - --disable-debug # libfaac is nonfree - - make - make tools/qt-faststart - make doc/ff{mpeg,play,server}.1 - - make DESTDIR="$pkgdir" install install-man - install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" -} - -# vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From b5d60ba3a7cc358fbc4dcfa51ba110633627fb13 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 4 Mar 2012 17:10:27 -0200 Subject: kernels/xen-tools --- kernels/xen-tools/PKGBUILD | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100755 kernels/xen-tools/PKGBUILD diff --git a/kernels/xen-tools/PKGBUILD b/kernels/xen-tools/PKGBUILD new file mode 100755 index 000000000..884c19ddf --- /dev/null +++ b/kernels/xen-tools/PKGBUILD @@ -0,0 +1,20 @@ +# Contributor: Bernhard Friedreich +# Contributor (Parabola): André Silva +# http://packages.debian.org/de/lenny-backports/xen-tools + +pkgname=xen-tools +pkgver=4.2.1 +pkgrel=1 +arch=('i686' 'x86_64') +pkgdesc="xen-tools is a collection of simple perl scripts which allow you to easily create new guest Xen domains" +license=('GPL') +url="http://www.xen-tools.org/software/xen-tools/" +depends=('perl-file-slurp' 'perl-text-template' 'perl-config-ini') +source=("http://ftp.us.debian.org/debian/pool/main/x/xen-tools/xen-tools_$pkgver-1_all.deb") + +build() { +ar x ${pkgname}_${pkgver}-${pkgrel}_all.deb +tar xzf data.tar.gz -C $pkgdir +} + +md5sums=('77931105c3fe3496ef106973433a2a64') -- cgit v1.2.3-54-g00ecf From 00a330d6e292702ccdfe4813d261f4ac6397a802 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 4 Mar 2012 18:46:59 -0200 Subject: kernels --- kernels/xen-tools/PKGBUILD | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100755 kernels/xen-tools/PKGBUILD diff --git a/kernels/xen-tools/PKGBUILD b/kernels/xen-tools/PKGBUILD deleted file mode 100755 index 884c19ddf..000000000 --- a/kernels/xen-tools/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# Contributor: Bernhard Friedreich -# Contributor (Parabola): André Silva -# http://packages.debian.org/de/lenny-backports/xen-tools - -pkgname=xen-tools -pkgver=4.2.1 -pkgrel=1 -arch=('i686' 'x86_64') -pkgdesc="xen-tools is a collection of simple perl scripts which allow you to easily create new guest Xen domains" -license=('GPL') -url="http://www.xen-tools.org/software/xen-tools/" -depends=('perl-file-slurp' 'perl-text-template' 'perl-config-ini') -source=("http://ftp.us.debian.org/debian/pool/main/x/xen-tools/xen-tools_$pkgver-1_all.deb") - -build() { -ar x ${pkgname}_${pkgver}-${pkgrel}_all.deb -tar xzf data.tar.gz -C $pkgdir -} - -md5sums=('77931105c3fe3496ef106973433a2a64') -- cgit v1.2.3-54-g00ecf