Fix of games/xblackjack-2.2
Please send as a diff against the port in the tree. -- Christian "naddy" Weisgerber naddy@mips.inka.de
State Changed From-To: open->feedback plz submit again in "diff" format, thanks
Also the Fix, does not seem to be complete: cc -O -pipe -mcpu=pentiumpro -mcpu=pentiumpro -I/usr/X11R6/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO -DVERSION="\"2.2\"" -c Table.c Table.c:133: `_XmManagerEnter' undeclared here (not in a function) Table.c:133: initializer element is not constant Table.c:133: (near initialization for `actionsList[0].proc') Table.c:133: initializer element is not constant Table.c:133: (near initialization for `actionsList[0]') [..]
On Wed, 8 Jan 2003, Tilman Linneweh wrote: > Also the Fix, does not seem to be complete: > > cc -O -pipe -mcpu=pentiumpro -mcpu=pentiumpro -I/usr/X11R6/include > -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO -DVERSION="\"2.2\"" -c Table.c > Table.c:133: `_XmManagerEnter' undeclared here (not in a function) > Table.c:133: initializer element is not constant > Table.c:133: (near initialization for `actionsList[0].proc') > Table.c:133: initializer element is not constant > Table.c:133: (near initialization for `actionsList[0]') > [..] Very strange. I did too try to compile it just after I got your mail, with the same result as you got. I know though that the fix did work a long time ago, as I did compile it and played the game. No one did however commit it and much later I saw the port marked as broken due to an OpenMotif upgrade. Maybe OpenMotif has changed and hence it does not work? Anyway I'll take a look at it once more (and hopefully someone will commit it before it renders useless due to the fact that other applications are updated :-) Best regards, Paul
On Wed, 8 Jan 2003, Tilman Linneweh wrote: > Also the Fix, does not seem to be complete: > > cc -O -pipe -mcpu=pentiumpro -mcpu=pentiumpro -I/usr/X11R6/include > -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO -DVERSION="\"2.2\"" -c Table.c > Table.c:133: `_XmManagerEnter' undeclared here (not in a function) > Table.c:133: initializer element is not constant > Table.c:133: (near initialization for `actionsList[0].proc') > Table.c:133: initializer element is not constant > Table.c:133: (near initialization for `actionsList[0]') > [..] Please apply this diff to the Makefile... freebsd# diff -ruNd Makefile.orig Makefile --- Makefile.orig Mon Jan 13 17:05:15 2003 +++ Makefile Mon Jan 13 17:05:27 2003 @@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org -USE_MOTIF= yes +LIB_DEPENDS+= Xm.1:${PORTSDIR}/x11-toolkits/lesstif USE_IMAKE= yes MAN1= xblackjack.1 Best regards, Paul
An updated shar file that incorporates all the above changes is attached. The diff.out file patches the Makefile; the rest of the files live in files/. Note that the existing files/patch-aa should be cvs rm'ed. # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # diff.out # xblackjack/files/patch-.::Draw.c # xblackjack/files/patch-.::Imakefile # xblackjack/files/patch-.::Strategy.c # xblackjack/files/patch-.::Table.c # echo x - diff.out sed 's/^X//' >diff.out << 'END-of-diff.out' X--- xblackjack/Makefile.dist Fri Feb 21 07:15:42 2003 X+++ xblackjack/Makefile Fri Apr 4 18:18:48 2003 X@@ -15,10 +15,8 @@ X MAINTAINER= ports@FreeBSD.org X COMMENT= An X11/Motif blackjack game X X-BROKEN= "Broken by open-motif upgrade" X- X-USE_MOTIF= yes X USE_IMAKE= yes X+LIB_DEPENDS+= Xm.1:${PORTSDIR}/x11-toolkits/lesstif X MAN1= xblackjack.1 X X .include <bsd.port.mk> END-of-diff.out echo x - xblackjack/files/patch-.::Draw.c sed 's/^X//' >xblackjack/files/patch-.::Draw.c << 'END-of-xblackjack/files/patch-.::Draw.c' X--- Draw.c.orig Wed Oct 30 22:16:05 2002 X+++ Draw.c Wed Oct 30 22:34:05 2002 X@@ -84,7 +84,7 @@ X #include <Xol/OpenLook.h> X #else X #include <X11/Xutil.h> X-#include <X11/Xm/Xm.h> X+#include <Xm/Xm.h> X #endif X #include "Assert.h" X #include "Bitmaps.h" END-of-xblackjack/files/patch-.::Draw.c echo x - xblackjack/files/patch-.::Imakefile sed 's/^X//' >xblackjack/files/patch-.::Imakefile << 'END-of-xblackjack/files/patch-.::Imakefile' X--- Imakefile.orig Wed Oct 30 22:39:10 2002 X+++ Imakefile Wed Oct 30 22:39:40 2002 X@@ -54,7 +54,7 @@ X /* X * You may need to remove -lbsd. X */ X- EXTRA_LIBRARIES = -lXm $(DEPLIBS) -lbsd X+ EXTRA_LIBRARIES = ${MOTIFLIB} -lXt -lXmu -lXext -lX11 X #endif X X /* END-of-xblackjack/files/patch-.::Imakefile echo x - xblackjack/files/patch-.::Strategy.c sed 's/^X//' >xblackjack/files/patch-.::Strategy.c << 'END-of-xblackjack/files/patch-.::Strategy.c' X--- Strategy.c.orig Wed Oct 30 22:23:48 2002 X+++ Strategy.c Wed Oct 30 22:24:07 2002 X@@ -95,8 +95,8 @@ X #include <Xol/OpenLook.h> X #include <Xol/StaticText.h> X #else X-#include <X11/Xm/Xm.h> X-#include <X11/Xm/Label.h> X+#include <Xm/Xm.h> X+#include <Xm/Label.h> X #include "Table.h" X #endif X #include "Assert.h" END-of-xblackjack/files/patch-.::Strategy.c echo x - xblackjack/files/patch-.::Table.c sed 's/^X//' >xblackjack/files/patch-.::Table.c << 'END-of-xblackjack/files/patch-.::Table.c' X--- Table.c.orig Wed Oct 30 22:35:52 2002 X+++ Table.c Wed Oct 30 23:11:30 2002 X@@ -229,7 +229,7 @@ X /* always_install_accelerators */ False, X #if XmVersion > 1000 X /* geo_matrix_create */ NULL, X- /* focus_moved_proc */ XtInheritFocusMovedProc, X+ /* focus_moved_proc */ /*XtInheritFocusMovedProc,*/ X #endif X /* extension */ NULL, X }, X@@ -967,7 +967,7 @@ X X /* XtMoveWidget(w, rx, ry);*/ X #if 1 X- _XmMoveObject((RectObj) w, rx, ry); X+ _XmMoveObject( w, rx, ry); X #else X _XmMoveObject( w, rx, ry); X #endif X@@ -1020,7 +1020,7 @@ X w, nw, nh, X w->core.border_width); X #endif X- _XmResizeObject((RectObj) managed->locs[i].w, nw, nh, X+ _XmResizeObject( managed->locs[i].w, nw, nh, X managed->locs[i].w->core.border_width); X } X END-of-xblackjack/files/patch-.::Table.c exit
State Changed From-To: feedback->closed Committed, thanks!