mr_bones_ 14/09/15 17:00:12
Modified: xboard-4.7.2-gnuchess-default.patch
xboard-4.7.2-Xaw3d.patch
xboard-4.7.2-configure-switches.patch
xboard-4.7.2-paths.patch xboard-4.7.2-gettext.patch
Added: xboard-4.7.3-paths.patch
xboard-4.7.3-gnuchess-default.patch
xboard-4.7.3-Xaw3d.patch
xboard-4.7.3-configure-switches.patch
xboard-4.7.3-gettext.patch
Log:
match patches to version
(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.2
games-board/xboard/files/xboard-4.7.2-gnuchess-default.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.2-gnuchess-default.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.2-gnuchess-default.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.2-gnuchess-default.patch?r1=1.1&r2=1.2
Index: xboard-4.7.2-gnuchess-default.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/games-board/xboard/files/xboard-4.7.2-gnuchess-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xboard-4.7.2-gnuchess-default.patch 6 Sep 2013 16:40:26 -0000 1.1
+++ xboard-4.7.2-gnuchess-default.patch 15 Sep 2014 17:00:12 -0000 1.2
@@ -4,8 +4,6 @@
set gnuchess as default engine
-diff --git a/gtk/xboard.h b/gtk/xboard.h
-index 5326af8..0fe90ed 100644
--- a/gtk/xboard.h
+++ b/gtk/xboard.h
@@ -118,8 +118,8 @@ typedef struct {
@@ -19,8 +17,6 @@
#define FIRST_DIRECTORY "."
#define SECOND_DIRECTORY "."
#define SOUND_BELL ""
-diff --git a/xaw/xboard.h b/xaw/xboard.h
-index 04692b5..508b52f 100644
--- a/xaw/xboard.h
+++ b/xaw/xboard.h
@@ -118,8 +118,8 @@ typedef struct {
@@ -34,8 +30,6 @@
#define FIRST_DIRECTORY "."
#define SECOND_DIRECTORY "."
#define SOUND_BELL ""
-diff --git a/xboard.conf.in b/xboard.conf.in
-index 38186c2..08a4f6e 100644
--- a/xboard.conf.in
+++ b/xboard.conf.in
@@ -67,8 +67,8 @@
1.2 games-board/xboard/files/xboard-4.7.2-Xaw3d.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.2-Xaw3d.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.2-Xaw3d.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.2-Xaw3d.patch?r1=1.1&r2=1.2
Index: xboard-4.7.2-Xaw3d.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/games-board/xboard/files/xboard-4.7.2-Xaw3d.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xboard-4.7.2-Xaw3d.patch 7 Sep 2013 11:19:26 -0000 1.1
+++ xboard-4.7.2-Xaw3d.patch 15 Sep 2014 17:00:12 -0000 1.2
@@ -7,8 +7,6 @@
Listing both one after another leads to withXaw being false
if you pass "--with-Xaw3d --without-Xaw".
-diff --git a/configure.ac b/configure.ac
-index 1664491..6548295 100644
--- a/configure.ac
+++ b/configure.ac
@@ -248,8 +248,7 @@ fi
1.2
games-board/xboard/files/xboard-4.7.2-configure-switches.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.2-configure-switches.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.2-configure-switches.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.2-configure-switches.patch?r1=1.1&r2=1.2
Index: xboard-4.7.2-configure-switches.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/games-board/xboard/files/xboard-4.7.2-configure-switches.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xboard-4.7.2-configure-switches.patch 6 Sep 2013 16:40:27 -0000
1.1
+++ xboard-4.7.2-configure-switches.patch 15 Sep 2014 17:00:12 -0000
1.2
@@ -6,8 +6,6 @@
https://savannah.gnu.org/bugs/?39971
-diff --git a/configure.ac b/configure.ac
-index 0a24161..1664491 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,18 +138,18 @@ FRONTEND_LIBS=""
1.3 games-board/xboard/files/xboard-4.7.2-paths.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.2-paths.patch?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.2-paths.patch?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.2-paths.patch?r1=1.2&r2=1.3
Index: xboard-4.7.2-paths.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/games-board/xboard/files/xboard-4.7.2-paths.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xboard-4.7.2-paths.patch 6 Sep 2013 20:57:37 -0000 1.2
+++ xboard-4.7.2-paths.patch 15 Sep 2014 17:00:12 -0000 1.3
@@ -10,8 +10,6 @@
https://savannah.gnu.org/bugs/index.php?39969
-diff --git a/Makefile.am b/Makefile.am
-index 61aa1d7..25f1138 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,24 +84,26 @@ sysconf_DATA = xboard.conf
@@ -85,8 +83,6 @@
dist_sounds_DATA = \
sounds/cymbal.wav sounds/pop2.wav sounds/slap.wav
sounds/ding1.wav sounds/laser.wav \
sounds/woodthunk.wav sounds/gong.wav sounds/penalty.wav
sounds/honkhonk.wav sounds/phone.wav
-diff --git a/configure.ac b/configure.ac
-index d7a6381..2a69733 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,6 +151,42 @@
1.2 games-board/xboard/files/xboard-4.7.2-gettext.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.2-gettext.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.2-gettext.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.2-gettext.patch?r1=1.1&r2=1.2
Index: xboard-4.7.2-gettext.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/games-board/xboard/files/xboard-4.7.2-gettext.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xboard-4.7.2-gettext.patch 6 Sep 2013 16:40:27 -0000 1.1
+++ xboard-4.7.2-gettext.patch 15 Sep 2014 17:00:12 -0000 1.2
@@ -7,8 +7,6 @@
https://bugs.gentoo.org/show_bug.cgi?id=418267
https://savannah.gnu.org/bugs/index.php?39970
-diff --git a/configure.ac b/configure.ac
-index 2a69733..0a24161 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,7 @@ AC_ISC_POSIX
1.1 games-board/xboard/files/xboard-4.7.3-paths.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.3-paths.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.3-paths.patch?rev=1.1&content-type=text/plain
Index: xboard-4.7.3-paths.patch
===================================================================
commit 3c112927b309889c14f8164a58020d1ddefd58d6
Author: hasufell <[email protected]>
Date: Fri Sep 6 16:35:03 2013 +0200
BUILD: make paths modifiable
This can help with setups where games are installed in their
own location, but system data files like desktopfiles
should still go to /usr/share.
https://savannah.gnu.org/bugs/index.php?39969
--- a/Makefile.am
+++ b/Makefile.am
@@ -84,24 +84,26 @@ sysconf_DATA = xboard.conf
### icon files
-icondir = $(datadir)/icons/hicolor/48x48/apps
+icondir = @ICONSDIR@
dist_icon_DATA = xboard.png
-svgicondir = $(datadir)/icons/hicolor/scalable/apps
+svgicondir = @SVGICONSDIR@
dist_svgicon_DATA = xboard.svg
### desktop files for KDE and gnome
-Applicationsdir = $(datadir)/applications
+Applicationsdir = @DESKTOPDIR@
Applications_DATA = xboard.desktop xboard-fen-viewer.desktop
xboard-pgn-viewer.desktop xboard-tourney.desktop xboard-config.desktop
### mime file
-mimedir = $(datadir)/mime/packages
+mimedir = @MIMEDIR@
mime_DATA = xboard.xml
+gamedatadir = @GAMEDATADIR@
+
### directory and files for svgs
-svgdir = $(datadir)/games/xboard/themes/default
+svgdir = $(gamedatadir)/themes/default
dist_svg_DATA = svg/icon_white.svg svg/icon_black.svg \
svg/BlackAdvisor.svg svg/WhiteAdvisor.svg \
svg/BlackArchbishop.svg svg/WhiteArchbishop.svg \
@@ -134,7 +136,7 @@ dist_svg_DATA = svg/icon_white.svg
svg/icon_black.svg \
svg/eo_Thinking.svg svg/eo_Unknown.svg \
svg/eo_White.svg
-shogidir = $(datadir)/games/xboard/themes/shogi
+shogidir = $(gamedatadir)/themes/shogi
dist_shogi_DATA = \
themes/shogi/WhiteGold.svg
themes/shogi/WhiteCrownedBishop.svg\
themes/shogi/WhiteBishop.svg themes/shogi/WhiteKing.svg\
@@ -151,7 +153,7 @@ dist_shogi_DATA = \
themes/shogi/BlackRook.svg themes/shogi/BlackCrownedRook.svg\
themes/shogi/BlackAdvisor.svg themes/shogi/BlackGoldSilver.svg
-xiangqidir = $(datadir)/games/xboard/themes/xiangqi
+xiangqidir = $(gamedatadir)/themes/xiangqi
dist_xiangqi_DATA = themes/xiangqi/BlackAdvisor.svg
themes/xiangqi/WhiteAdvisor.svg \
themes/xiangqi/BlackCanon.svg themes/xiangqi/WhiteCanon.svg \
themes/xiangqi/BlackElephant.svg themes/xiangqi/WhiteElephant.svg \
@@ -162,17 +164,17 @@ dist_xiangqi_DATA = themes/xiangqi/BlackAdvisor.svg
themes/xiangqi/WhiteAdvisor
### directory and files for pixmaps
-pixmapsdir = $(datadir)/games/xboard/pixmaps/textures
+pixmapsdir = $(gamedatadir)/pixmaps/textures
dist_pixmaps_DATA = pixmaps/cross32.xpm pixmaps/cross48.xpm
pixmaps/board32.xpm pixmaps/board48.xpm pixmaps/ini32.xpm pixmaps/ini48.xpm
### directory and files for pngs
-pngdir = $(datadir)/games/xboard/themes/textures
+pngdir = $(gamedatadir)/themes/textures
dist_png_DATA = png/hatch.png png/wood_d.png png/wood_l.png png/xqboard.png
### directory and files for sound files
-soundsdir = $(datadir)/games/xboard/sounds
+soundsdir = $(gamedatadir)/sounds
dist_sounds_DATA = \
sounds/cymbal.wav sounds/pop2.wav sounds/slap.wav sounds/ding1.wav
sounds/laser.wav \
sounds/woodthunk.wav sounds/gong.wav sounds/penalty.wav
sounds/honkhonk.wav sounds/phone.wav
--- a/configure.ac
+++ b/configure.ac
@@ -151,6 +151,42 @@
[with_Xaw="$withval"],
[with_Xaw="no"])
+AC_ARG_WITH([iconsdir],
+ [AS_HELP_STRING([--with-iconsdir=DIR],
+ [path where icons get
installed (default: $datadir/icons/hicolor/48x48/apps)])],
+ [ICONSDIR="$withval"],
+ [ICONSDIR='$(datadir)/icons/hicolor/48x48/apps'])
+
+AC_ARG_WITH([svgiconsdir],
+ [AS_HELP_STRING([--with-svgiconsdir=DIR],
+ [path where svg icons
get installed (default: $datadir/icons/hicolor/scalable/apps)])],
+ [SVGICONSDIR="$withval"],
+ [SVGICONSDIR='$(datadir)/icons/hicolor/scalable/apps'])
+
+AC_ARG_WITH([desktopdir],
+ [AS_HELP_STRING([--with-desktopdir=DIR],
+ [path where desktop
files get installed (default: $datadir/applications)])],
+ [DESKTOPDIR="$withval"],
+ [DESKTOPDIR='$(datadir)/applications'])
+
+AC_ARG_WITH([mimedir],
+ [AS_HELP_STRING([--with-mimedir=DIR],
+ [path where mime files
get installed (default: $datadir/mime/packages)])],
+ [MIMEDIR="$withval"],
+ [MIMEDIR='$(datadir)/mime/packages'])
+
+AC_ARG_WITH([gamedatadir],
+ [AS_HELP_STRING([--with-gamedatadir=DIR],
+ [path where game data
files get installed (default: $datadir/games/xboard)])],
+ [GAMEDATADIR="$withval"],
+ [GAMEDATADIR='$(datadir)/games/xboard'])
+
+AC_SUBST(ICONSDIR)
+AC_SUBST(SVGICONSDIR)
+AC_SUBST(DESKTOPDIR)
+AC_SUBST(MIMEDIR)
+AC_SUBST(GAMEDATADIR)
+
dnl | check for libraries
if test x"$with_GTK" = x"yes" ; then
PKG_CHECK_MODULES([GTK], [ gtk+-2.0 >= 2.16.0 gmodule-2.0 ])
@@ -515,8 +551,12 @@
echo ""
echo " prefix: $prefix "
echo " datarootdir: $datarootdir "
-echo " datadir: $datadir (icons will go in
\$datadir/icons/hicolor/...)"
-echo " (bitmaps will go in
\$datadir/games/xboard/...)"
+echo " datadir: $datadir "
+echo " gamedatadir: $GAMEDATADIR "
+echo " desktopdir: $DESKTOPDIR "
+echo " mimedir: $MIMEDIR "
+echo " iconsdir: $ICONSDIR "
+echo " svgiconsdir: $SVGICONSDIR "
echo " infodir: $infodir (info files will go here)"
echo " sysconfdir: $sysconfdir (xboard.conf will go here)"
echo ""
1.1
games-board/xboard/files/xboard-4.7.3-gnuchess-default.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.3-gnuchess-default.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.3-gnuchess-default.patch?rev=1.1&content-type=text/plain
Index: xboard-4.7.3-gnuchess-default.patch
===================================================================
commit 0b6d8acf55b4d8721e854cfba025e621f61ff5c2
Author: hasufell <[email protected]>
Date: Fri Sep 6 18:15:38 2013 +0200
set gnuchess as default engine
--- a/gtk/xboard.h
+++ b/gtk/xboard.h
@@ -118,8 +118,8 @@ typedef struct {
#define BORDER_X_OFFSET 3
#define BORDER_Y_OFFSET 27
-#define FIRST_CHESS_PROGRAM "fairymax"
-#define SECOND_CHESS_PROGRAM "fairymax"
+#define FIRST_CHESS_PROGRAM "gnuchess"
+#define SECOND_CHESS_PROGRAM "gnuchess"
#define FIRST_DIRECTORY "."
#define SECOND_DIRECTORY "."
#define SOUND_BELL ""
--- a/xaw/xboard.h
+++ b/xaw/xboard.h
@@ -118,8 +118,8 @@ typedef struct {
#define BORDER_X_OFFSET 3
#define BORDER_Y_OFFSET 27
-#define FIRST_CHESS_PROGRAM "fairymax"
-#define SECOND_CHESS_PROGRAM "fairymax"
+#define FIRST_CHESS_PROGRAM "gnuchess"
+#define SECOND_CHESS_PROGRAM "gnuchess"
#define FIRST_DIRECTORY "."
#define SECOND_DIRECTORY "."
#define SOUND_BELL ""
--- a/xboard.conf.in
+++ b/xboard.conf.in
@@ -67,8 +67,8 @@
;
; Engines & adjudicatons in engine-engine games
;
--firstChessProgram fairymax
--secondChessProgram fairymax
+-firstChessProgram gnuchess
+-secondChessProgram gnuchess
-firstChessProgramNames {fairymax
"Fruit 2.1" -fcp fruit -fUCI
"Crafty" -fcp crafty
1.1 games-board/xboard/files/xboard-4.7.3-Xaw3d.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.3-Xaw3d.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.3-Xaw3d.patch?rev=1.1&content-type=text/plain
Index: xboard-4.7.3-Xaw3d.patch
===================================================================
commit 7bc79645d4e404d00fee43b5a6cee4e3b6bf7a35
Author: hasufell <[email protected]>
Date: Sat Sep 7 12:48:58 2013 +0200
BUILD: fix withXaw conditional
Listing both one after another leads to withXaw being false
if you pass "--with-Xaw3d --without-Xaw".
--- a/configure.ac
+++ b/configure.ac
@@ -248,8 +248,7 @@ fi
dnl | make results available in Makefile.am
AM_CONDITIONAL([withGTK], [test x"$with_GTK" = x"yes"])
-AM_CONDITIONAL([withXaw], [test x"$with_Xaw3d" = x"yes"])
-AM_CONDITIONAL([withXaw], [test x"$with_Xaw" = x"yes"])
+AM_CONDITIONAL([withXaw], [test x"$with_Xaw3d" = x"yes" || test x"$with_Xaw"
= x"yes"])
AC_SUBST(FRONTEND_CFLAGS)
1.1
games-board/xboard/files/xboard-4.7.3-configure-switches.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.3-configure-switches.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.3-configure-switches.patch?rev=1.1&content-type=text/plain
Index: xboard-4.7.3-configure-switches.patch
===================================================================
commit adcbc6072fa0d1a9bf84e018f04b1c18dfedab5c
Author: hasufell <[email protected]>
Date: Fri Sep 6 16:56:15 2013 +0200
BUILD: fix configure switches
https://savannah.gnu.org/bugs/?39971
--- a/configure.ac
+++ b/configure.ac
@@ -138,18 +138,18 @@ FRONTEND_LIBS=""
AC_ARG_WITH([gtk],
[AS_HELP_STRING([--with-gtk],[use GTK front-end (experimental)])],
- [with_GTK=yes],
- [with_GTK=no])
+ [with_GTK=$withval],
+ [with_GTK="no"])
AC_ARG_WITH([Xaw3d],
[AS_HELP_STRING([--with-Xaw3d],[use Xaw3d front-end (not fully
supported anymore)])],
- [with_Xaw3d=yes],
- [with_Xaw3d=no])
+ [with_Xaw3d="$withval"],
+ [with_Xaw3d="no"])
AC_ARG_WITH([Xaw],
[AS_HELP_STRING([--with-Xaw],[use Xaw front-end (default)])],
- [with_Xaw=yes],
- [with_Xaw=no])
+ [with_Xaw="$withval"],
+ [with_Xaw="no"])
AC_ARG_WITH([iconsdir],
[AS_HELP_STRING([--with-iconsdir=DIR],
1.1 games-board/xboard/files/xboard-4.7.3-gettext.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.3-gettext.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-board/xboard/files/xboard-4.7.3-gettext.patch?rev=1.1&content-type=text/plain
Index: xboard-4.7.3-gettext.patch
===================================================================
commit 7688073f2967bb3438d1a2d8ccffc53f697219fb
Author: hasufell <[email protected]>
Date: Fri Sep 6 16:37:22 2013 +0200
BUILD: fix gettext version
https://bugs.gentoo.org/show_bug.cgi?id=418267
https://savannah.gnu.org/bugs/index.php?39970
--- a/configure.ac
+++ b/configure.ac
@@ -76,7 +76,7 @@ AC_ISC_POSIX
AC_PROG_INSTALL
dnl| add gettext support
-AM_GNU_GETTEXT_VERSION(0.17)
+AM_GNU_GETTEXT_VERSION(0.18)
AM_GNU_GETTEXT([external])
AC_CHECK_PROGS(RSH, remsh rsh, rsh)
