From 3afa139b0c31646cc4bc9f2030490cb4004e4f64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <bjoern.esser@gmail.com>
Date: Sat, 12 Jul 2014 14:50:07 +0200
Subject: [PATCH] updated wine-cjk.patch, dropped obsolete wine-rpath.patch

---
 wine-cjk.patch   |  9 +++++----
 wine-rpath.patch | 45 ---------------------------------------------
 2 files changed, 5 insertions(+), 49 deletions(-)
 delete mode 100644 wine-rpath.patch

diff --git a/wine-cjk.patch b/wine-cjk.patch
index 2b4d95b..ed7af8f 100644
--- a/wine-cjk.patch
+++ b/wine-cjk.patch
@@ -1,7 +1,8 @@
-diff -up wine-1.7.5/loader/wine.inf.in.orig wine-1.7.5/loader/wine.inf.in
---- wine-1.7.5/loader/wine.inf.in.orig	2013-10-25 19:45:30.000000000 +0200
-+++ wine-1.7.5/loader/wine.inf.in	2013-10-28 07:57:42.572401071 +0100
-@@ -561,6 +561,17 @@ HKLM,%FontSubStr%,"Times New Roman CE,23
+Index: wine-1.7.22/loader/wine.inf.in
+===================================================================
+--- wine-1.7.22.orig/loader/wine.inf.in
++++ wine-1.7.22/loader/wine.inf.in
+@@ -568,6 +568,17 @@ HKLM,%FontSubStr%,"Times New Roman CE,23
  HKLM,%FontSubStr%,"Times New Roman CYR,204",,"Times New Roman,204"
  HKLM,%FontSubStr%,"Times New Roman Greek,161",,"Times New Roman,161"
  HKLM,%FontSubStr%,"Times New Roman TUR,162",,"Times New Roman,162"
diff --git a/wine-rpath.patch b/wine-rpath.patch
deleted file mode 100644
index 151a30d..0000000
--- a/wine-rpath.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- configure.orig	2010-10-04 21:35:31.000000000 +0200
-+++ configure	2010-10-04 21:37:48.000000000 +0200
-@@ -6775,14 +6775,14 @@
- 
- fi
- 
--      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,--rpath,\\$ORIGIN/../lib" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,--rpath,\$ORIGIN/../lib... " >&6; }
-+      as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC" >&5
-+$as_echo_n "checking whether the compiler supports -fPIC " >&6; }
- if eval "test \"\${$as_ac_var+set}\"" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
-+CFLAGS="$CFLAGS -fPIC"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }
-@@ -6800,17 +6800,17 @@
- 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
- $as_echo "$ac_res" >&6; }
- if test `eval 'as_val=${'$as_ac_var'};$as_echo "$as_val"'` = yes; then :
--  LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
--                       LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"
-+  LDRPATH_INSTALL=""
-+                       LDRPATH_LOCAL=""
- else
--  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC -Wl,-R,\\$ORIGIN/../lib" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
--$as_echo_n "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... " >&6; }
-+  as_ac_var=`$as_echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fPIC" >&5
-+$as_echo_n "checking whether the compiler supports -fPIC " >&6; }
- if eval "test \"\${$as_ac_var+set}\"" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_wine_try_cflags_saved=$CFLAGS
--CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib"
-+CFLAGS="$CFLAGS -fPIC"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- int main(int argc, char **argv) { return 0; }