testing/motif: remove unused and unneeded patches

the debian menu patch was not used
the multiarch patch is not needed since we dont support multiarch

3 files changed, 1 insertions, 74 deletions

diff --git a/testing/motif/04-add-debian-menu-structure-to-system.mwmrc-menu.patch b/testing/motif/04-add-debian-menu-structure-to-system.mwmrc-menu.patch
deleted file mode 100644
index 4d4b784c3b..0000000000
--- a/testing/motif/04-add-debian-menu-structure-to-system.mwmrc-menu.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Add Debian menu structure to system.mwmrc-menu
-Forwarded: not-needed
-Author: Stefan Bauer <stefan.bauer@cubewerk.de>
-Author: Graham Inggs <graham@nerve.org.za>
-Last-Update: 2013-01-21
---- a/clients/mwm/system.mwmrc
-+++ b/clients/mwm/system.mwmrc
-@@ -49,6 +49,8 @@
- 	"Pack Icons"		f.pack_icons
- !	"Toggle Behavior..."	f.set_behavior
- 	 no-label		f.separator
-+	"Debian"		f.menu "/Debian"
-+	 no-label		f.separator
- 	"Restart..."		f.restart
- 	"Quit..."		f.quit_mwm
- 
-@@ -141,3 +143,7 @@
- !!
- !!  END OF mwm RESOURCE DESCRIPTION FILE
- !!
-+
-+! debian menu
-+!include-menu-defs
-+include-menu-defs
diff --git a/testing/motif/05-multiarch-specialcase-libdir-X11.patch b/testing/motif/05-multiarch-specialcase-libdir-X11.patch
deleted file mode 100644
index 74bc2fff39..0000000000
--- a/testing/motif/05-multiarch-specialcase-libdir-X11.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Description: Relocate non-libs from /usr/lib/X11
- For multiarch support, we change libdir to /usr/lib/$(DEB_HOST_MULTIARCH).
- However, we do not want to do this to /usr/lib/X11 yet.
- .
- Note that XMBINDDIR_FALLBACK should really be set to /usr/share/X11/bindings
- since the files are platform-independent. We postpone moving them until a
- decision has been reached on libmotif-common.
- .
- The configure.ac fixes are minimal and only suitable for Debian/Ubuntu
- packaging. For upstream one might want to add a command line option.
- .
- Sergio Gelato, 2012-05-20.
- .
- Allow the MWM resources and fallback bindings directories to be customized
- with the --with-mwmrcdir and --xmbinddir configure options respectively.
- Now we can relocate non-library files from /usr/lib/X11 to /usr/share/X11
- (bindings) and /etc/X11/mwm (MWM resources) in debian/rules, allowing us to
- split motif into architecture-dependent and architecture-independent packages.
- .
- Graham Inggs, 2013-03-12.
-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673690
-Forwarded: http://bugs.motifzone.net/show_bug.cgi?id=1581
-Author: Sergio Gelato <Sergio.Gelato@astro.su.se>
-Author: Graham Inggs <graham@nerve.org.za>
-Last-Update: 2013-03-08
---- a/configure.ac
-+++ b/configure.ac
-@@ -178,13 +178,15 @@
- LIBDIR="${libdir}/X11"
- AC_SUBST(LIBDIR)
- 
--MWMRCDIR="${libdir}/X11"
-+AC_ARG_WITH(mwmrcdir, [  --with-mwmrcdir=DIR  mwm resources are located in DIR], mwmrcdir=$withval, mwmrcdir="${libdir}/X11")
-+MWMRCDIR="$mwmrcdir"
- AC_SUBST(MWMRCDIR)
- 
- INCDIR="${includedir}/X11"
- AC_SUBST(INCDIR)
- 
--XMBINDDIR_FALLBACK="${libdir}/X11/bindings"
-+AC_ARG_WITH(xmbinddir, [  --with-xmbinddir=DIR  fallback bindings are located in DIR], xmbinddir=$withval, xmbinddir="${libdir}/X11/bindings")
-+XMBINDDIR_FALLBACK="$xmbinddir"
- AC_SUBST(XMBINDDIR_FALLBACK)
- 
- RM="rm -f"
diff --git a/testing/motif/APKBUILD b/testing/motif/APKBUILD
index 522c15fab8..01c10d45d5 100644
--- a/testing/motif/APKBUILD
+++ b/testing/motif/APKBUILD
@@ -4,7 +4,7 @@
 
 pkgname=motif
 pkgver=2.3.4
-pkgrel=0
+pkgrel=1
 pkgdesc="The Motif library"
 url="http://motif.ics.com/"
 arch="all"
@@ -18,7 +18,6 @@ source="http://downloads.sourceforge.net/$pkgname/Motif%20$pkgver%20Source%20Cod
 01-fix-autoconf.patch
 02-fix-format-security.patch
 03-no-demos.patch
-05-multiarch-specialcase-libdir-X11.patch
 06-cast-size_t-to-int.patch
 07-fix_lintian_reported_manpage_typos.patch
 08-fix_hyphen_in_man_pages.patch
@@ -110,7 +109,6 @@ md5sums="612bb8127d0d31da6e5474edf8a5c247  motif-2.3.4-src.tgz
 191cee7af8137e75385153a8f334f50c  01-fix-autoconf.patch
 34044aeba20b7e4e9c543c771ce015f6  02-fix-format-security.patch
 7302c76677201e0be743fe3bb7f1cc8b  03-no-demos.patch
-1adcb4a307af3281722a20bdcaf0d0c9  05-multiarch-specialcase-libdir-X11.patch
 bb676bc8f0a0d24fbb5c599b72dc827a  06-cast-size_t-to-int.patch
 ec750525c43510227b834d70239f7af4  07-fix_lintian_reported_manpage_typos.patch
 d6d836f83e3f9c9b2754f3486c7e3682  08-fix_hyphen_in_man_pages.patch
@@ -128,7 +126,6 @@ sha256sums="637efa09608e0b8f93465dbeb7c92e58ebb14c4bc1b488040eb79a65af3efbe0  mo
 cfdd253918b2fdbfa1803d59c7b1a20431a74de4227d20db0343aab866505c21  01-fix-autoconf.patch
 b679d4274c18fd4e29aad8fc757d0d635ce715329b28e8f46f6952ed9a8f390d  02-fix-format-security.patch
 c084ed5838c50296e18bd1354e812699e891d4a326c3fdd6e262a7a9e33eea8d  03-no-demos.patch
-9cbfdbfec6841f4dd26cebb463b1f2912bc8a08320938d29fb978a38ed256dd7  05-multiarch-specialcase-libdir-X11.patch
 85afe090f6f45ed4baef76a7d73cebf70343a6aaee0209cb4a12ac34b48610c4  06-cast-size_t-to-int.patch
 90e8ac475990c130345f0a1f9365329599184a4f1112dc863f33f727abee22d1  07-fix_lintian_reported_manpage_typos.patch
 5fda6f879619c3d9761b222114e8ee0f548f874cca8ae9122d1b436c96a58d8d  08-fix_hyphen_in_man_pages.patch
@@ -146,7 +143,6 @@ sha512sums="fb1033caa68f25b93282fa6700d5b7856be217b3651072d86e7c93a747df5b312192
 6ca24c74233552a4ce3ebb72f17ed277a3feca10bfa50c4680ed1eff917a11bf1f0bd39bcfdaaef1104466065c25c70251ba450f884bca637bc935565d0cdd9d  01-fix-autoconf.patch
 aff5be25bd25666e6134bc18faaffd54914cc390ca4d89a498efae5aa6dd175ac2b17dc719f7b8d27cff5db2f17b714ddfd5a163f219cad5f5c949cf5eb4786d  02-fix-format-security.patch
 a54e0bbf95b7af1a2ba3a6031b3d4f36b6516d4b30d97804158c20b7cccda5df9628ed9a3c84ddda7cbd7779781ad065b0a16d39115184eff9fa509f6ec75ec6  03-no-demos.patch
-7e5f07e904f7cbea988d6cb7c65fefc5790c84d3bbc77aaa7e3de2fd22a5bd262d5519d56620080d830e2e79e3ffd09ee47d3b72374783b6f52b55eea4da00c0  05-multiarch-specialcase-libdir-X11.patch
 605f3cc868c179c74ada49bd4ed40a39364f5d883866c99a9e8ffdb1c559e5e06ebf92a776b6a10df516b7f82a186b0084e55a9be1076498f5b742ca9376febc  06-cast-size_t-to-int.patch
 0c4f678e34a00e3281337b06dffbf5f50d345f66b86bb86dd1532d435ce1630443f8ec6245bb773143783d1b5e6e99da5f1e68bd7391e23ee0a10e4fb99ed737  07-fix_lintian_reported_manpage_typos.patch
 fc955d88cc5c64655ec642786449968e2241c92653fec00bcf8a722d2c206a2ebad16e42529d4ba1905d40e4239e567189b7abd1b9f1c2bdad944cb134094b7c  08-fix_hyphen_in_man_pages.patch