From b6c2a9f39ea60bdbbbdd3445400c6fe82f414f7a Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Wed, 29 Dec 2010 17:39:27 -0600
Subject: misc/fribid: Uncompressed the patch

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 misc/fribid/fribid.SlackBuild                  |   2 +-
 misc/fribid/seamonkey-nss_compile_fix.patch    |  30 +++++++++++++++++++++++++
 misc/fribid/seamonkey-nss_compile_fix.patch.gz | Bin 666 -> 0 bytes
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 misc/fribid/seamonkey-nss_compile_fix.patch
 delete mode 100644 misc/fribid/seamonkey-nss_compile_fix.patch.gz

(limited to 'misc/fribid')

diff --git a/misc/fribid/fribid.SlackBuild b/misc/fribid/fribid.SlackBuild
index ac186b72bce8..ccee7ccaaef5 100644
--- a/misc/fribid/fribid.SlackBuild
+++ b/misc/fribid/fribid.SlackBuild
@@ -73,7 +73,7 @@ find . \
  -exec chmod 644 {} \;
 
 # patch to compile against system nss
-zcat $CWD/seamonkey-nss_compile_fix.patch.gz | patch -p1
+patch -p1 < $CWD/seamonkey-nss_compile_fix.patch
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/misc/fribid/seamonkey-nss_compile_fix.patch b/misc/fribid/seamonkey-nss_compile_fix.patch
new file mode 100644
index 000000000000..bfcdb3ce9167
--- /dev/null
+++ b/misc/fribid/seamonkey-nss_compile_fix.patch
@@ -0,0 +1,30 @@
+diff -ur fribid-0.1.2.orig/client/Makefile fribid-0.1.2/client/Makefile
+--- fribid-0.1.2.orig/client/Makefile	2010-03-24 00:32:27.000000000 +0100
++++ fribid-0.1.2/client/Makefile	2010-04-07 21:24:16.000000000 +0200
+@@ -22,10 +22,10 @@
+ 
+ CFLAGS ?= -O2 -g
+ COMMONCFLAGS=$(CFLAGS) -Wall -Wextra -std=c99 -pedantic -Wno-unused-parameter
+-CCFLAGS=$(COMMONCFLAGS) -I../npapi/include `pkg-config --cflags 'gtk+-2.0 >= 2.12' glib-2.0 'nss >= 3.10' nspr` -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1
++CCFLAGS=$(COMMONCFLAGS) -I../npapi/include `pkg-config --cflags 'gtk+-2.0 >= 2.12' glib-2.0 'nss >= 2.0' nspr` -DGTK_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DG_DISABLE_DEPRECATED=1
+ # You may have to add -lpthread after $(LDFLAGS) on OpenBSD
+ LINKFLAGS=$(CFLAGS) $(LDFLAGS) -Wl,--as-needed
+-LIBS=`pkg-config --libs 'gtk+-2.0 >= 2.12' glib-2.0 'nss >= 3.10' nspr`
++LIBS=`pkg-config --libs 'gtk+-2.0 >= 2.12' glib-2.0 'nss >= 2.0' nspr`
+ 
+ # Files to be installed
+ LIB_PATH=`../configure --internal--get-define=LIB_PATH`
+Endast i fribid-0.1.2/common: config.h
+diff -ur fribid-0.1.2.orig/configure fribid-0.1.2/configure
+--- fribid-0.1.2.orig/configure	2010-03-24 00:32:27.000000000 +0100
++++ fribid-0.1.2/configure	2010-04-07 21:25:17.000000000 +0200
+@@ -171,7 +171,7 @@
+ 
+ oldifs=IFS
+ IFS=";"
+-pkgconfigDeps="gtk+-2.0 >= 2.12;glib-2.0;nss >= 3.10;nspr;x11"
++pkgconfigDeps="gtk+-2.0 >= 2.12;glib-2.0;nss >= 2.0;nspr;x11"
+ 
+ if ! pkg-config --exists $pkgconfigDeps; then
+     echo "Error: Unsatisfied dependencies: " >&2
+Endast i fribid-0.1.2/: configure~
diff --git a/misc/fribid/seamonkey-nss_compile_fix.patch.gz b/misc/fribid/seamonkey-nss_compile_fix.patch.gz
deleted file mode 100644
index 76603f1898d9..000000000000
Binary files a/misc/fribid/seamonkey-nss_compile_fix.patch.gz and /dev/null differ
-- 
cgit v1.2.3