Merge branch '3.1' into 3.2
This commit is contained in:
commit
bbf51fac84
@ -1,3 +1,4 @@
|
|||||||
d71f0f761c51aeae03e367001afc9f8d firefox-41.0.2.source.tar.xz
|
d71f0f761c51aeae03e367001afc9f8d firefox-41.0.2.source.tar.xz
|
||||||
1c53b819f800c61cd50e7c47bdb30bf0 firefox-install-dir.patch
|
1c53b819f800c61cd50e7c47bdb30bf0 firefox-install-dir.patch
|
||||||
cf6971669f70b440cb6ff8df8b2722ae firefox.desktop
|
cf6971669f70b440cb6ff8df8b2722ae firefox.desktop
|
||||||
|
efe2feea78bec0cf095ea9541ca5af78 freetype.patch
|
||||||
|
@ -5,13 +5,14 @@
|
|||||||
|
|
||||||
name=firefox
|
name=firefox
|
||||||
version=41.0.2
|
version=41.0.2
|
||||||
release=1
|
release=2
|
||||||
source=(http://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.xz
|
source=(http://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.xz
|
||||||
firefox-install-dir.patch firefox.desktop)
|
firefox-install-dir.patch firefox.desktop freetype.patch)
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd mozilla-release
|
cd mozilla-release
|
||||||
|
|
||||||
|
patch -p1 -i $SRC/freetype.patch
|
||||||
patch -p1 -i $SRC/firefox-install-dir.patch
|
patch -p1 -i $SRC/firefox-install-dir.patch
|
||||||
|
|
||||||
cat <<- EOF > .mozconfig
|
cat <<- EOF > .mozconfig
|
||||||
|
12
firefox/freetype.patch
Normal file
12
firefox/freetype.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -rupN mozilla-release.orig/config/system-headers mozilla-release/config/system-headers
|
||||||
|
--- mozilla-release.orig/config/system-headers 2015-10-18 17:35:49.589375378 +0200
|
||||||
|
+++ mozilla-release/config/system-headers 2015-10-18 17:36:45.288324530 +0200
|
||||||
|
@@ -466,6 +466,7 @@ freetype/ftsizes.h
|
||||||
|
freetype/ftadvanc.h
|
||||||
|
freetype/ftbitmap.h
|
||||||
|
freetype/ftxf86.h
|
||||||
|
+freetype/ftfntfmt.h
|
||||||
|
freetype.h
|
||||||
|
ftcache.h
|
||||||
|
ftfntfmt.h
|
||||||
|
|
@ -19,41 +19,41 @@ drwxr-xr-x root/root usr/bin/
|
|||||||
-rwxr-xr-x root/root usr/bin/nvidia-smi
|
-rwxr-xr-x root/root usr/bin/nvidia-smi
|
||||||
-rwxr-xr-x root/root usr/bin/nvidia-xconfig
|
-rwxr-xr-x root/root usr/bin/nvidia-xconfig
|
||||||
drwxr-xr-x root/root usr/lib/
|
drwxr-xr-x root/root usr/lib/
|
||||||
-rwxr-xr-x root/root usr/lib/libGL.so.352.41
|
-rwxr-xr-x root/root usr/lib/libGL.so.352.55
|
||||||
lrwxrwxrwx root/root usr/lib/libGL_so_1_2_nvidia -> libGL.so.352.41
|
lrwxrwxrwx root/root usr/lib/libGL_so_1_2_nvidia -> libGL.so.352.55
|
||||||
lrwxrwxrwx root/root usr/lib/libOpenCL.so -> libOpenCL.so.1.0.0
|
lrwxrwxrwx root/root usr/lib/libOpenCL.so -> libOpenCL.so.1.0.0
|
||||||
-rwxr-xr-x root/root usr/lib/libOpenCL.so.1.0.0
|
-rwxr-xr-x root/root usr/lib/libOpenCL.so.1.0.0
|
||||||
-rwxr-xr-x root/root usr/lib/libcuda.so.352.41
|
-rwxr-xr-x root/root usr/lib/libcuda.so.352.55
|
||||||
lrwxrwxrwx root/root usr/lib/libnvcuvid.so -> libnvcuvid.so.352.41
|
lrwxrwxrwx root/root usr/lib/libnvcuvid.so -> libnvcuvid.so.352.55
|
||||||
lrwxrwxrwx root/root usr/lib/libnvcuvid.so.1 -> libnvcuvid.so.352.41
|
lrwxrwxrwx root/root usr/lib/libnvcuvid.so.1 -> libnvcuvid.so.352.55
|
||||||
-rwxr-xr-x root/root usr/lib/libnvcuvid.so.352.41
|
-rwxr-xr-x root/root usr/lib/libnvcuvid.so.352.55
|
||||||
-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.352.41
|
-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.352.55
|
||||||
-rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.352.41
|
-rwxr-xr-x root/root usr/lib/libnvidia-compiler.so.352.55
|
||||||
-rwxr-xr-x root/root usr/lib/libnvidia-encode.so.352.41
|
-rwxr-xr-x root/root usr/lib/libnvidia-encode.so.352.55
|
||||||
-rwxr-xr-x root/root usr/lib/libnvidia-fbc.so.352.41
|
-rwxr-xr-x root/root usr/lib/libnvidia-fbc.so.352.55
|
||||||
-rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.352.41
|
-rwxr-xr-x root/root usr/lib/libnvidia-glcore.so.352.55
|
||||||
-rwxr-xr-x root/root usr/lib/libnvidia-gtk2.so.352.41
|
-rwxr-xr-x root/root usr/lib/libnvidia-gtk2.so.352.55
|
||||||
-rwxr-xr-x root/root usr/lib/libnvidia-gtk3.so.352.41
|
-rwxr-xr-x root/root usr/lib/libnvidia-gtk3.so.352.55
|
||||||
-rwxr-xr-x root/root usr/lib/libnvidia-ifr.so.352.41
|
-rwxr-xr-x root/root usr/lib/libnvidia-ifr.so.352.55
|
||||||
lrwxrwxrwx root/root usr/lib/libnvidia-ml.so -> libnvidia-ml.so.352.41
|
lrwxrwxrwx root/root usr/lib/libnvidia-ml.so -> libnvidia-ml.so.352.55
|
||||||
lrwxrwxrwx root/root usr/lib/libnvidia-ml.so.1 -> libnvidia-ml.so.352.41
|
lrwxrwxrwx root/root usr/lib/libnvidia-ml.so.1 -> libnvidia-ml.so.352.55
|
||||||
-rwxr-xr-x root/root usr/lib/libnvidia-ml.so.352.41
|
-rwxr-xr-x root/root usr/lib/libnvidia-ml.so.352.55
|
||||||
-rwxr-xr-x root/root usr/lib/libnvidia-opencl.so.352.41
|
-rwxr-xr-x root/root usr/lib/libnvidia-opencl.so.352.55
|
||||||
-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.352.41
|
-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.352.55
|
||||||
drwxr-xr-x root/root usr/lib/tls/
|
drwxr-xr-x root/root usr/lib/tls/
|
||||||
-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.352.41
|
-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.352.55
|
||||||
drwxr-xr-x root/root usr/lib/vdpau/
|
drwxr-xr-x root/root usr/lib/vdpau/
|
||||||
lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so -> libvdpau_nvidia.so.352.41
|
lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so -> libvdpau_nvidia.so.352.55
|
||||||
lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so.1 -> libvdpau_nvidia.so.352.41
|
lrwxrwxrwx root/root usr/lib/vdpau/libvdpau_nvidia.so.1 -> libvdpau_nvidia.so.352.55
|
||||||
-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.352.41
|
-rwxr-xr-x root/root usr/lib/vdpau/libvdpau_nvidia.so.352.55
|
||||||
drwxr-xr-x root/root usr/lib/xorg/
|
drwxr-xr-x root/root usr/lib/xorg/
|
||||||
drwxr-xr-x root/root usr/lib/xorg/modules/
|
drwxr-xr-x root/root usr/lib/xorg/modules/
|
||||||
drwxr-xr-x root/root usr/lib/xorg/modules/drivers/
|
drwxr-xr-x root/root usr/lib/xorg/modules/drivers/
|
||||||
-rwxr-xr-x root/root usr/lib/xorg/modules/drivers/nvidia_drv.so
|
-rwxr-xr-x root/root usr/lib/xorg/modules/drivers/nvidia_drv.so
|
||||||
drwxr-xr-x root/root usr/lib/xorg/modules/extensions/
|
drwxr-xr-x root/root usr/lib/xorg/modules/extensions/
|
||||||
-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.352.41
|
-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.352.55
|
||||||
lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.352.41
|
lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.352.55
|
||||||
-rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.352.41
|
-rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.352.55
|
||||||
drwxr-xr-x root/root usr/man/
|
drwxr-xr-x root/root usr/man/
|
||||||
drwxr-xr-x root/root usr/man/man1/
|
drwxr-xr-x root/root usr/man/man1/
|
||||||
-rw-r--r-- root/root usr/man/man1/nvidia-persistenced.1.gz
|
-rw-r--r-- root/root usr/man/man1/nvidia-persistenced.1.gz
|
||||||
@ -64,6 +64,6 @@ drwxr-xr-x root/root usr/share/
|
|||||||
drwxr-xr-x root/root usr/share/applications/
|
drwxr-xr-x root/root usr/share/applications/
|
||||||
-rw-r--r-- root/root usr/share/applications/nvidia-settings.desktop
|
-rw-r--r-- root/root usr/share/applications/nvidia-settings.desktop
|
||||||
drwxr-xr-x root/root usr/share/nvidia/
|
drwxr-xr-x root/root usr/share/nvidia/
|
||||||
-rw-r--r-- root/root usr/share/nvidia/nvidia-application-profiles-352.41-key-documentation
|
-rw-r--r-- root/root usr/share/nvidia/nvidia-application-profiles-352.55-key-documentation
|
||||||
drwxr-xr-x root/root usr/share/pixmaps/
|
drwxr-xr-x root/root usr/share/pixmaps/
|
||||||
-rw-r--r-- root/root usr/share/pixmaps/nvidia-settings.png
|
-rw-r--r-- root/root usr/share/pixmaps/nvidia-settings.png
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
4511024cc556d0c6e7c467b6789524e2 90-nvidia-uvm.rules
|
4511024cc556d0c6e7c467b6789524e2 90-nvidia-uvm.rules
|
||||||
d41d1a358edbade36cfd97cdcc9a80b9 NVIDIA-Linux-x86_64-352.41-no-compat32.run
|
b692dd13ffc481fc44af6d7dae2f0226 NVIDIA-Linux-x86_64-352.55-no-compat32.run
|
||||||
07e8f8a60f3be17700de4451a2737ede nvidia-3.18.patch
|
07e8f8a60f3be17700de4451a2737ede nvidia-3.18.patch
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
# Depends on: gtk gl-select
|
# Depends on: gtk gl-select
|
||||||
|
|
||||||
name=nvidia
|
name=nvidia
|
||||||
version=352.41
|
version=352.55
|
||||||
release=1
|
release=1
|
||||||
source=(http://us.download.nvidia.com/XFree86/Linux-x86_64/$version/NVIDIA-Linux-x86_64-$version-no-compat32.run \
|
source=(http://us.download.nvidia.com/XFree86/Linux-x86_64/$version/NVIDIA-Linux-x86_64-$version-no-compat32.run \
|
||||||
90-nvidia-uvm.rules $name-3.18.patch)
|
90-nvidia-uvm.rules $name-3.18.patch)
|
||||||
|
@ -5,13 +5,13 @@
|
|||||||
|
|
||||||
name=thunderbird
|
name=thunderbird
|
||||||
version=38.3.0
|
version=38.3.0
|
||||||
release=1
|
release=2
|
||||||
source=(http://ftp.mozilla.org/pub/thunderbird/releases/$version/source/$name-$version.source.tar.bz2
|
source=(http://ftp.mozilla.org/pub/thunderbird/releases/$version/source/$name-$version.source.tar.bz2
|
||||||
$name.desktop thunderbird-install-dir.patch)
|
$name.desktop thunderbird-install-dir.patch)
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd $SRC/comm-esr38
|
cd $SRC/comm-esr38
|
||||||
sed -i '/^ftglyph.h/ i ftfntfmt.h' mozilla/config/system-headers
|
sed -i '/^ftglyph.h/ i freetype/ftfntfmt.h' mozilla/config/system-headers
|
||||||
patch -p1 -i $SRC/thunderbird-install-dir.patch
|
patch -p1 -i $SRC/thunderbird-install-dir.patch
|
||||||
export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$name"
|
export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$name"
|
||||||
|
|
||||||
|
12
thunderbird/freetype.patch
Normal file
12
thunderbird/freetype.patch
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
diff -rupN mozilla-release.orig/config/system-headers mozilla-release/config/system-headers
|
||||||
|
--- mozilla-release.orig/config/system-headers 2015-10-18 17:35:49.589375378 +0200
|
||||||
|
+++ mozilla-release/config/system-headers 2015-10-18 17:36:45.288324530 +0200
|
||||||
|
@@ -466,6 +466,7 @@ freetype/ftsizes.h
|
||||||
|
freetype/ftadvanc.h
|
||||||
|
freetype/ftbitmap.h
|
||||||
|
freetype/ftxf86.h
|
||||||
|
+freetype/ftfntfmt.h
|
||||||
|
freetype.h
|
||||||
|
ftcache.h
|
||||||
|
ftfntfmt.h
|
||||||
|
|
Loading…
Reference in New Issue
Block a user