ports/opt
4
3
Fork 1
Code Issues 1 Pull Requests Activity

firefox: updated to 2.0.0.8 and patched (from Danny Rawlins) for permissions issues

Browse Source
This commit is contained in:
Matt Housh 2007-10-22 10:21:26 -05:00
parent dc44e2a84a
commit 9b5b941fcf
3 changed files with 11 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firefox/.md5sum
View File

@ -1,6 +1,5 @@
25f355113cdee6800380c6e1a4cd38f0 firefox-2.0-add-ldflags.patch
ec14cf833d75d07190c4095345d688bd firefox-2.0.0.7-source.tar.bz2
f975d9aa6ec232da0dfa8f27398d2af3 firefox-nopangoxft.patch
f4ffac67751bc3e556c4926da2e0b65a firefox-2.0.0.8-source.tar.bz2
0eceebd5fbc394248c8c94d66fc95d66 firefox.desktop
19ec3915f76e7eb820ad2c59730ee2be firefox.png
95de7479767fc69e62ad7958d620d955 mozconfig

13
firefox/Pkgfile
View File

@ -4,10 +4,10 @@
# Depends on: libidl, gtk, libpng, libjpeg, zlib
name=firefox
version=2.0.0.7
version=2.0.0.8
release=1
source=(ftp://ftp.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version-source.tar.bz2 \
$name-2.0-add-ldflags.patch $name-nopangoxft.patch \
$name-2.0-add-ldflags.patch \
http://crux.nu/files/$name/$name.desktop \
http://crux.nu/files/$name/$name.png \
mozconfig)
@ -20,7 +20,6 @@ build() {
cd mozilla
patch -p0 -i $SRC/$name-2.0-add-ldflags.patch
patch -p1 -i $SRC/$name-nopangoxft.patch
sed -e "s/#CFLAGS#/$CFLAGS/" $SRC/mozconfig > .mozconfig
./configure
make
@ -52,4 +51,12 @@ build() {
install -D -m 0644 $SRC/$name.desktop \
$PKG/usr/share/applications/$name.desktop
install -D -m 0644 $SRC/$name.png $PKG/usr/share/pixmaps/$name.png
# fix file permissions since version 2.0.0.8
find $PKG/usr/include/firefox -type f -exec chmod g+r,a+r {} \;
find $PKG/usr/include/firefox -type f -perm -u=x -exec chmod g+x,a+x {} \; # no code in headerfiles!
find $PKG/usr/share/idl -type f -name '*.idl' -exec chmod g+r,a+r {} \;
find $PKG/usr/share/idl -type f -name '*.idl' -perm -u=x -exec chmod g+x,a+x {} \;
find $PKG/usr/lib/firefox -type f -exec chmod g+r,a+r {} \;
chmod 755 $PKG/usr/lib/firefox/run-mozilla.sh
}

37
firefox/firefox-nopangoxft.patch
View File

@ -1,37 +0,0 @@
--- mozilla/gfx/src/gtk/mozilla-decoder.cpp.noxft 2004-11-07 18:59:23.000000000 -0500
+++ mozilla/gfx/src/gtk/mozilla-decoder.cpp 2006-08-06 18:24:37.000000000 -0400
@@ -40,10 +40,9 @@
#define PANGO_ENABLE_ENGINE
#include "mozilla-decoder.h"
-#include <pango/pangoxft.h>
#include <pango/pangofc-fontmap.h>
#include <pango/pangofc-font.h>
-#include <gdk/gdkx.h>
+#include <gdk/gdkpango.h>
#include "nsString.h"
#include "nsIPersistentProperties2.h"
@@ -145,6 +144,13 @@ mozilla_decoders_init(void)
if (initialized)
return 0;
+ PangoContext* context = gdk_pango_context_get ();
+ PangoFontMap* fontmap = pango_context_get_font_map (context);
+ g_object_unref (context);
+
+ if (!PANGO_IS_FC_FONT_MAP (fontmap))
+ return -1;
+
encoder_hash = g_hash_table_new(g_str_hash, g_str_equal);
cmap_hash = g_hash_table_new(g_str_hash, g_str_equal);
wide_hash = g_hash_table_new(g_str_hash, g_str_equal);
@@ -208,7 +214,7 @@ mozilla_decoders_init(void)
}
}
- pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
+ pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(fontmap),
mozilla_find_decoder,
NULL,
NULL);