summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCecil Hugh Watson <knoppmyth@gmail.com>2009-08-06 04:27:07 (GMT)
committerCecil Hugh Watson <knoppmyth@gmail.com>2009-08-06 04:27:07 (GMT)
commit71a0c4222361abdb601f5bfc5382f5fc27d531ef (patch)
treef2b95c36f64d3f823fb8bfff4adc9f45bc888dc2
parentceba0c42b85bd01bece02c68c22fe906b812a0ad (diff)
parent66ff84165690a39ab01a2a39107c98be0ffde695 (diff)
downloadlinhes_pkgbuild-71a0c4222361abdb601f5bfc5382f5fc27d531ef.zip
linhes_pkgbuild-71a0c4222361abdb601f5bfc5382f5fc27d531ef.tar.gz
linhes_pkgbuild-71a0c4222361abdb601f5bfc5382f5fc27d531ef.tar.bz2
Merge branch 'HEAD' of ssh://cesman@knoppmyth.net/mount/repository/LinHES-PKGBUILD
-rwxr-xr-xabs/core-testing/system-templates/PKGBUILD2
-rw-r--r--abs/extra-testing/community/firefox/PKGBUILD23
2 files changed, 21 insertions, 4 deletions
diff --git a/abs/core-testing/system-templates/PKGBUILD b/abs/core-testing/system-templates/PKGBUILD
index 8f25a66..8a4d35e 100755
--- a/abs/core-testing/system-templates/PKGBUILD
+++ b/abs/core-testing/system-templates/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=system-templates
pkgver=1.0
-pkgrel=35
+pkgrel=36
conflicts=( )
pkgdesc="Templates used for system configuration"
depends=()
diff --git a/abs/extra-testing/community/firefox/PKGBUILD b/abs/extra-testing/community/firefox/PKGBUILD
index babf777..191c913 100644
--- a/abs/extra-testing/community/firefox/PKGBUILD
+++ b/abs/extra-testing/community/firefox/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=firefox
pkgver=3.5.1
-pkgrel=2
+pkgrel=3
_xulver=1.9.1.1
pkgdesc="Standalone web browser from mozilla.org"
arch=(i686 x86_64)
@@ -20,7 +20,8 @@ source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/s
mozilla-firefox-1.0-lang.patch
browser-defaulturls.patch
firefox-version.patch
- browser-app-makefile.patch)
+ browser-app-makefile.patch
+ http://fpdownload.macromedia.com/get/flashplayer/current/install_flash_player_10_linux.tar.gz)
md5sums=('18169e189785d680827d4fce94524449'
'3c928b11918d22377eba01de34debc19'
'68cf02788491c6e846729b2f2913bf79'
@@ -28,7 +29,8 @@ md5sums=('18169e189785d680827d4fce94524449'
'bd5db57c23c72a02a489592644f18995'
'346d74ec560e7bbf453c02ff21f4b868'
'1dd9a10df0b9e4cf332eadc326d78e07'
- '165c43a5b03a0bf7ad2e7210b0d8c82c')
+ '165c43a5b03a0bf7ad2e7210b0d8c82c'
+ '6306980e40a3266b4b6c173bfcfdc946')
build() {
cd "${srcdir}/mozilla-1.9.1"
@@ -56,4 +58,19 @@ build() {
install -m644 ${srcdir}/mozilla-1.9.1/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/firefox.png || return 1
install -m644 ${srcdir}/firefox.desktop ${pkgdir}/usr/share/applications/ || return 1
install -m644 ${srcdir}/firefox-safe.desktop ${pkgdir}/usr/share/applications/ || return 1
+
+ # Install the flash player plugin.
+
+ mkdir -p ${pkgdir}/usr/lib/firefox-3.5/plugins
+ install -m755 ${srcdir}/libflashplayer.so ${pkgdir}/usr/lib/firefox-3.5/plugins || return 1
+
+ # This is to stop firefox from crashing when the flashplayer (youtube) is
+ # set to full screen. To test if it is still necessary with updates to
+ # this package, run /usr/bin/firefox.bin without setting the LD_PRELOAD var.
+
+ mv ${pkgdir}/usr/bin/firefox ${pkgdir}/usr/bin/firefox.bin
+ echo "#!/bin/bash
+export LD_PRELOAD=/usr/lib/libGL.so.1
+/usr/bin/firefox.bin" > ${pkgdir}/usr/bin/firefox
+ chmod 755 ${pkgdir}/usr/bin/firefox
}