From 139760bc46997548489cbba9349af64c4130cf7840a7cbc975e0f0611e6dc396 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Thu, 1 Apr 2021 11:49:07 +0000
Subject: [PATCH] Update to xfig 3.2.8a

OBS-URL: https://build.opensuse.org/package/show/graphics/xfig?expand=0&rev=74
---
 xfig-3.2.8.tar.xz                       |  3 ---
 xfig-3.2.8a.tar.xz                      |  3 +++
 xfig.3.2.3d-international-std-fonts.dif |  2 +-
 xfig.3.2.5b-locale.dif                  |  6 +++---
 xfig.changes                            | 11 +++++++++++
 xfig.spec                               | 16 +++++++++-------
 6 files changed, 27 insertions(+), 14 deletions(-)
 delete mode 100644 xfig-3.2.8.tar.xz
 create mode 100644 xfig-3.2.8a.tar.xz

diff --git a/xfig-3.2.8.tar.xz b/xfig-3.2.8.tar.xz
deleted file mode 100644
index 8d4b461..0000000
--- a/xfig-3.2.8.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:55d40e9611c359e9452241f4dd59c2a39b6f6ccc811bde0c875deab2ac3203bd
-size 4782992
diff --git a/xfig-3.2.8a.tar.xz b/xfig-3.2.8a.tar.xz
new file mode 100644
index 0000000..3482372
--- /dev/null
+++ b/xfig-3.2.8a.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2cff6c3f5a0901c269e91d884535d7b0b4194d33c053d3c284276ccbd6253114
+size 5394128
diff --git a/xfig.3.2.3d-international-std-fonts.dif b/xfig.3.2.3d-international-std-fonts.dif
index a85fe2b..292c198 100644
--- a/xfig.3.2.3d-international-std-fonts.dif
+++ b/xfig.3.2.3d-international-std-fonts.dif
@@ -1,6 +1,6 @@
 --- src/main.c
 +++ src/main.c	2013-12-10 13:40:27.062735528 +0000
-@@ -329,8 +329,36 @@ static XtResource application_resources[
+@@ -378,8 +378,36 @@ static XtResource application_resources[
         XtOffset(appresPtr, always_use_fontset), XtRBoolean, (caddr_t) & false},
      {"fixedFontSet", "FontSet", XtRFontSet, sizeof(XFontSet),
         XtOffset(appresPtr, fixed_fontset), XtRString,
diff --git a/xfig.3.2.5b-locale.dif b/xfig.3.2.5b-locale.dif
index 838889f..8bb8ba3 100644
--- a/xfig.3.2.5b-locale.dif
+++ b/xfig.3.2.5b-locale.dif
@@ -16,7 +16,7 @@ Index: src/main.c
  #endif
  #ifdef USE_TAB		/* input extensions for an input tablet */
  #include <X11/extensions/XInput.h>
-@@ -831,11 +833,6 @@ main(int argc, char **argv)
+@@ -818,11 +820,6 @@ main(int argc, char **argv)
  	}
      }
  
@@ -28,7 +28,7 @@ Index: src/main.c
      /*
       * save the command line arguments
       */
-@@ -937,6 +934,10 @@ main(int argc, char **argv)
+@@ -924,6 +921,10 @@ main(int argc, char **argv)
  		setup_icons_big();
  
  #ifdef I18N
@@ -39,7 +39,7 @@ Index: src/main.c
      /************************************************************/
      /* if the international option has been set, set the locale */
      /************************************************************/
-@@ -1657,6 +1658,11 @@ setup_visual(int *argc_p, char **argv, A
+@@ -1644,6 +1645,11 @@ setup_visual(int *argc_p, char **argv, A
  	 */
  	tool = XtAppInitialize (&tool_app, "Fig", options, XtNumber (options), argc_p, argv,
  			       (String *) NULL, args, 0);
diff --git a/xfig.changes b/xfig.changes
index 32c3f6e..bdf82a7 100644
--- a/xfig.changes
+++ b/xfig.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Apr  1 11:47:00 UTC 2021 - Dr. Werner Fink <werner@suse.de>
+
+- Update to xfig 3.2.8 Patchlevel 8a (Mar 2021)
+  o Distribute a current pdf documentation.
+    Thanks to Roland Rosenfeld for the script and pointing out the issue.
+- Correct hunk offsets of the patches
+  o xfig.3.2.3d-international-std-fonts.dif
+  o xfig.3.2.5b-locale.dif
+  o xfig.spec
+
 -------------------------------------------------------------------
 Wed Feb 10 12:37:21 UTC 2021 - Dirk Müller <dmueller@suse.com>
 
diff --git a/xfig.spec b/xfig.spec
index df49d0d..8546706 100644
--- a/xfig.spec
+++ b/xfig.spec
@@ -17,7 +17,7 @@
 
 
 Name:           xfig
-Version:        3.2.8
+Version:        3.2.8a
 Release:        0
 Summary:        Facility for Interactive Generation of Figures under the X Window System
 License:        MIT
@@ -25,9 +25,9 @@ Group:          Productivity/Graphics/Vector Editors
 URL:            https://sourceforge.net/projects/mcj/
 #
 # Remove forbidden files: aircraft.fig
-# <uncompess> xfig-3.2.8.tar
-# tar -f xfig-3.2.8.tar --delete xfig-3.2.8/Libraries/Examples/aircraft.fig
-# <compress> xfig-3.2.8.tar
+# <uncompess> xfig-3.2.8a.tar
+# tar -f xfig-3.2.8a.tar --delete xfig-3.2.8a/Libraries/Examples/aircraft.fig
+# <compress> xfig-3.2.8a.tar
 #
 #Source:        http://sourceforge.net/projects/mcj/files/xfig-%{version}.tar.xz/download#/xfig-%{version}.tar.xz
 Source:         xfig-%{version}.tar.xz
@@ -104,10 +104,12 @@ cat > xaw3d.pc <<-'EOF'
 	exec_prefix=%{_prefix}
 	libdir=%{_prefix}/lib
 	includedir=%{_includedir}
-	Name: Xaw3d
+Name:           Xaw3d
 	Description: X 3D Athena Widgets Library
-	Version: 1.5E
-	Requires: xproto xmu xt
+Version:        1.5E
+Requires:       xmu
+Requires:       xproto
+Requires:       xt
 	Requires.private: x11 xext
 	Cflags: -I${includedir}  -DXAW_INTERNATIONALIZATION -DXAW_MULTIPLANE_PIXMAPS -DXAW_GRAY_BLKWHT_STIPPLES -DXAW_ARROW_SCROLLBARS
 	Libs: -L${libdir} -lXaw3d