From kde-commits  Thu Sep 01 20:58:49 2005
From: Nicolas Hadacek <hadacek () kde ! org>
Date: Thu, 01 Sep 2005 20:58:49 +0000
To: kde-commits
Subject: KDE/kdegames
Message-Id: <1125608329.033708.27430.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=112560834110069

SVN commit 456007 by hadacek:

(forwrd port)
- fix dependencies
- "fix" bug #65488 by disabling network games


 M  +4 -0      ksirtet/CHANGELOG  
 M  +1 -0      ksirtet/ksirtet/Makefile.am  
 M  +2 -2      ksirtet/ksirtet/main.cpp  
 M  +1 -1      libksirtet/common/Makefile.am  
 M  +2 -1      libksirtet/lib/wizard.cpp  


--- trunk/KDE/kdegames/ksirtet/CHANGELOG #456006:456007
@@ -1,3 +1,7 @@
+2.1.11b (1 September 2005) [KDE 3.4.3 stable]
+ * fix compilation dependencies
+ * "fix" bug #65488 by disabling network games
+
 2.1.11 (12 September 2004) [KDE 3.3.1 stable]
  * fix loss of key down action after switching windows (bug #86017)
  * fix removed lines being not updated at restart (bug #88990)
--- trunk/KDE/kdegames/ksirtet/ksirtet/Makefile.am #456006:456007
@@ -4,6 +4,7 @@
 
 bin_PROGRAMS    = ksirtet
 ksirtet_LDADD   = $(top_builddir)/libksirtet/common/libksirtetcommon.la
+ksirtet_DEPENDENCIES = $(top_builddir)/libksirtet/common/libksirtetcommon.la
 ksirtet_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) $(KDE_RPATH)
 ksirtet_SOURCES = piece.cpp board.cpp ai.cpp field.cpp settings.cpp main.cpp prefs.kcfgc
 METASOURCES     = board.moc ai.moc field.moc settings.moc main.moc
--- trunk/KDE/kdegames/ksirtet/ksirtet/main.cpp #456006:456007
@@ -26,8 +26,8 @@
     I18N_NOOP("KSirtet is an adaptation of the well-known Tetris game"),
     "http://ksirtet.sourceforge.net/",
     I18N_NOOP("Removed Lines"),
-    "2.1.11",
-    "2.1.11 (12 September 2004)"
+    "2.1.12",
+    "2.1.12 (1 September 2005)"
 };
 
 const uint HISTOGRAM_SIZE = 8;
--- trunk/KDE/kdegames/libksirtet/common/Makefile.am #456006:456007
@@ -2,7 +2,7 @@
 
 noinst_LTLIBRARIES             = libksirtetcommon.la
 libksirtetcommon_la_LDFLAGS = $(all_libraries) -no-undefined
-libksirtetcommon_la_DEPENDENCIES = $(LIB_KDEGAMES_DEP)
+libksirtetcommon_la_DEPENDENCIES = $(LIB_KDEGAMES_DEP) $(top_builddir)/libksirtet/lib/libksirtetmultiplayers.la $(top_builddir)/libksirtet/base/libksirtetbase.la
 libksirtetcommon_la_LIBADD  = $(LIB_KDEGAMES) $(top_builddir)/libksirtet/lib/libksirtetmultiplayers.la $(top_builddir)/libksirtet/base/libksirtetbase.la
 
 noinst_HEADERS              = types.h factory.h misc_ui.h highscores.h \
--- trunk/KDE/kdegames/libksirtet/lib/wizard.cpp #456006:456007
@@ -40,7 +40,8 @@
 				   QWidget *parent, const char *name)
 : KWizard(parent, name, TRUE), cd(_cd)
 {
-	setupTypePage();
+//	setupTypePage(); // #### REMOVE NETWORK GAMES UNTIL FIXED
+    type = Local;
 	setupLocalPage(gi);
 }