Fix to be i3-wm compatible

* remove hide/show functionalities which interfered with i3-wm.

4 files changed, 63 insertions, 34 deletions

diff --git a/.AURINFO b/.AURINFO
deleted file mode 100644
index 0e49ce262417..000000000000
--- a/.AURINFO
+++ /dev/null
@@ -1,16 +0,0 @@
-pkgbase = xnec2c
-	pkgdesc = GTK+ Antenna EM Modeling Client
-	pkgver = 3.2
-	pkgrel = 1
-	url = http://www.qsl.net/5b4az/pkg/nec2/xnec2c/doc/xnec2c.html
-	arch = i686
-	arch = x86_64
-	license = GPL
-	depends = gtk2
-	source = http://www.qsl.net/5b4az/pkg/nec2/xnec2c/xnec2c-3.2.tar.bz2
-	source = xnec2c.desktop
-	source = xnec2c.sh
-	source = http://bjensen.fedorapeople.org/pkgs/hams/icon/Ham_Icon-1-48.png
-
-pkgname = xnec2c
-
diff --git a/.SRCINFO b/.SRCINFO
index 81dc2e44ba09..8c948dad4560 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,5 @@
-# Generated by mksrcinfo v8
-# Sun Jul 28 11:26:16 UTC 2019
-pkgbase = xnec2c
-	pkgdesc = GTK+ Antenna EM Modeling Client
+pkgbase = xnec2c-i3wm
+	pkgdesc = GTK+ Antenna EM Modeling Client - patched to be I3wm compatible
 	pkgver = 4.1.1
 	pkgrel = 1
 	url = http://www.qsl.net/5b4az/pkg/nec2/xnec2c/doc/xnec2c.html
@@ -10,12 +8,16 @@ pkgbase = xnec2c
 	license = GPL
 	depends = gtk2
 	optdepends = gnuplot: to use plotted output/data files
+	provides = xnec2c
+	conflicts = xnec2c
+	source = donthide.patch
 	source = http://www.qsl.net/5b4az/pkg/nec2/xnec2c/xnec2c-4.1.1.tar.bz2
 	source = xnec2c.desktop
 	source = http://bjensen.fedorapeople.org/pkgs/hams/icon/Ham_Icon-1-48.png
+	md5sums = SKIP
 	md5sums = ad8e922388dc364c113f3ac06d4eddf3
 	md5sums = 824c296ecb84175a5fa0905b8f357796
 	md5sums = 38378f273628bd9a28d3e5f9ff39fa18
 
-pkgname = xnec2c
+pkgname = xnec2c-i3wm
 
diff --git a/PKGBUILD b/PKGBUILD
index 05e7ebf46ffb..9cf073a5d052 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
-# Maintainer: Kyle Keen <keenerd@gmail.com>
+# Maintainer - main package: Kyle Keen <keenerd@gmail.com>
+# Maintainer - i3wm fork: Jan Zelenka <3yanyanyan@gmail.com>
 # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
 
-pkgname=xnec2c
+pkgname=xnec2c-i3wm
 pkgver=4.1.1
 pkgrel=1
-pkgdesc="GTK+ Antenna EM Modeling Client"
+pkgdesc="GTK+ Antenna EM Modeling Client - patched to be I3wm compatible"
 arch=('i686' 'x86_64')
 #url="http://5b4az.chronos.org.uk/pages/nec2.html"
 #url="http://web.archive.org/web/20110724184011/http://5b4az.chronos.org.uk/pages/nec2.html"
@@ -12,17 +13,27 @@ url="http://www.qsl.net/5b4az/pkg/nec2/xnec2c/doc/xnec2c.html"
 license=('GPL')
 depends=('gtk2')
 optdepends=('gnuplot: to use plotted output/data files')
+provides=('xnec2c')
+conflicts=('xnec2c')
 #source=(http://5b4az.chronos.org.uk/pkg/nec2/$pkgname/$pkgname-$pkgver.tar.bz2
 #source=(http://pkgs.fedoraproject.org/repo/pkgs/$pkgname/$pkgname-$pkgver.tar.bz2/d3c1d34da5519cf66ff429de51c6c768/$pkgname-$pkgver.tar.bz2
-source=("http://www.qsl.net/5b4az/pkg/nec2/xnec2c/xnec2c-$pkgver.tar.bz2"
-        "$pkgname.desktop"
+_pkgname=xnec2c
+source=("donthide.patch"
+        "http://www.qsl.net/5b4az/pkg/nec2/xnec2c/xnec2c-$pkgver.tar.bz2"
+        "$_pkgname.desktop"
         "http://bjensen.fedorapeople.org/pkgs/hams/icon/Ham_Icon-1-48.png")
-md5sums=('ad8e922388dc364c113f3ac06d4eddf3'
+md5sums=('SKIP'
+         'ad8e922388dc364c113f3ac06d4eddf3'
          '824c296ecb84175a5fa0905b8f357796'
          '38378f273628bd9a28d3e5f9ff39fa18')
 
+prepare() {
+	cd "$srcdir/$_pkgname-$pkgver/src"
+    patch --strip=0 "--input=${srcdir}/donthide.patch"
+}
+
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$srcdir/$_pkgname-$pkgver"
 	# or add AC_SEARCH_LIBS(clogl, m) to configure.in
 	sed -i 's/1.14/1.15/g' {autogen.sh,aclocal.m4}
 	./autogen.sh
@@ -31,17 +42,17 @@ build() {
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	mkdir -p "$pkgdir/usr/share/$pkgname/"{doc/images,examples}
+	cd "$srcdir/$_pkgname-$pkgver"
+	mkdir -p "$pkgdir/usr/share/$_pkgname/"{doc/images,examples}
 	mkdir -p "$pkgdir/usr/share/"{applications,pixmaps}
 
 	make DESTDIR="$pkgdir" install
 
-	install -m644 doc/images/* "$pkgdir/usr/share/$pkgname/doc/images"
+	install -m644 doc/images/* "$pkgdir/usr/share/$_pkgname/doc/images"
 	rm -r doc/images
-	install -m644 doc/* "$pkgdir/usr/share/$pkgname/doc"
-	install -m644 examples/* "$pkgdir/usr/share/$pkgname/examples"
+	install -m644 doc/* "$pkgdir/usr/share/$_pkgname/doc"
+	install -m644 examples/* "$pkgdir/usr/share/$_pkgname/examples"
 	install -m644 ../*.desktop "$pkgdir/usr/share/applications/"
-	install -m644 ../Ham_Icon-1-48.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
+	install -m644 ../Ham_Icon-1-48.png "$pkgdir/usr/share/pixmaps/$_pkgname.png"
 }
 
diff --git a/donthide.patch b/donthide.patch
new file mode 100644
index 000000000000..1d5f8a54cda6
--- /dev/null
+++ b/donthide.patch
@@ -0,0 +1,32 @@
+--- rc_config.c
++++ rc_config.c
+@@ -163,7 +163,6 @@
+   if( (width == 0) || (height == 0) ) return;
+ 
+   /* Set size and position of window */
+-  gtk_widget_hide( window );
+   gtk_window_resize( GTK_WINDOW(window), width, height );
+   gtk_window_move( GTK_WINDOW(window), x, y );
+ 
+@@ -214,7 +213,6 @@
+   Set_Window_Geometry( main_window,
+ 	  rc_config.main_x, rc_config.main_y,
+ 	  rc_config.main_width, rc_config.main_height );
+-  gtk_widget_show( main_window );
+ 
+   /* Restore main (structure) window widgets state */
+   if( rc_config.main_currents_togglebutton )
+--- callback_func.c
++++ callback_func.c
+@@ -1026,11 +1026,9 @@
+ Open_Nec2_Editor( int action )
+ {
+   nec2_edit_window = create_nec2_editor( &nec2_editor_builder );
+-  gtk_widget_hide( nec2_edit_window );
+   Set_Window_Geometry( nec2_edit_window,
+ 	  rc_config.nec2_edit_x, rc_config.nec2_edit_y,
+ 	  rc_config.nec2_edit_width, rc_config.nec2_edit_height );
+-  gtk_widget_show( nec2_edit_window );
+ 
+   cmnt_treeview = GTK_TREE_VIEW(
+ 	  Builder_Get_Object(nec2_editor_builder, "nec2_cmnt_treeview") );