cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update KSlide to latest version, 1.0.1. Previous version did not work

Browse Source 
anyway (at least on i386). MAINTAINER timeout => removing him.

Minor tweaks to port's Makefile while there: WANTLIB, license etc.

"go ahead" espie@
This commit is contained in:
zhuk 2013-12-19 12:46:15 +00:00
parent 9e1e665d62
commit eed46b5d22
8 changed files with 111 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
games/kslide/Makefile
View File

@ -1,27 +1,25 @@
# $OpenBSD: Makefile,v 1.26 2013/10/22 11:34:15 zhuk Exp $
# $OpenBSD: Makefile,v 1.27 2013/12/19 12:46:15 zhuk Exp $
COMMENT= puzzle game for KDE
DISTNAME= kslide-0.90
REVISION = 8
DISTNAME= kslide-1.0.1
CATEGORIES= games
HOMEPAGE= http://perso.wanadoo.fr/coquelle/taquin/
MAINTAINER= Kevin Lo <kevlo@openbsd.org>
HOMEPAGE= http://kde-apps.org/content/show.php/KSlide?content=10317
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB = GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
WANTLIB += Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm art_lgpl_2 c drm
WANTLIB += expat fam fontconfig freetype idn jpeg lcms m mng png pthread
WANTLIB += pthread-stubs stdc++ util xcb z
WANTLIB += ${KDE}/DCOP ${KDE}/kdecore>=4 ${KDE}/kdefx
WANTLIB += ${KDE}/kdesu ${KDE}/kdeui ${KDE}/kio
WANTLIB += ${KDE}/kwalletclient
WANTLIB = c expat m pthread pthread-stubs stdc++ util z
WANTLIB += GL ICE SM X11 Xcursor Xdamage Xext Xfixes Xft
WANTLIB += Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm
WANTLIB += X11-xcb Xau Xdmcp drm glapi xcb xcb-dri2 xcb-glx
WANTLIB += fontconfig freetype
WANTLIB += art_lgpl_2 fam idn jpeg lcms mng png
WANTLIB += ${KDE}/DCOP ${KDE}/kdecore>=4 ${KDE}/kdefx ${KDE}/kdesu
WANTLIB += ${KDE}/kdeui ${KDE}/kio ${KDE}/kwalletclient
MASTER_SITES= http://david.bieder.free.fr/eric/taquin/ \
http://perso.wanadoo.fr/coquelle/taquin/
MASTER_SITES= ${MASTER_SITES_FREEBSD}
EXTRACT_SUFX= .tar.bz2
RUN_DEPENDS= x11/gtk+2,-guic
@ -30,20 +28,13 @@ DPB_PROPERTIES = tag:kde3
MODULES= x11/kde devel/gettext
MAKE_ENV= ${CONFIGURE_ENV}
# Ensure qt2 will always be at the front
MAKE_FLAGS= CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS}
CONFIGURE_ARGS+= --with-extra-libs=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-extra-includes=${LOCALBASE}/include
CONFIGURE_ENV= ${MODKDE_CONFIGURE_ENV}
MAKE_ENV= ${CONFIGURE_ENV}
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/admin
MODKDE_FIXUP_DATADIR= Yes
CONFIGURE_STYLE= gnu autoconf
AUTOCONF_VERSION= 2.59
CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} ${MODKDE_CONFIGURE_ARGS}
WRKDIST= ${WRKDIR}/kslide
PORTHOME= ${WRKDIR}
.include <bsd.port.mk>

7
games/kslide/distinfo
View File

@ -1,5 +1,2 @@
MD5 (kslide-0.90.tar.bz2) = dtR5fAectPSWjiPXxbODFA==
RMD160 (kslide-0.90.tar.bz2) = /j7i1qjff5yButtrY93RYOMGzqk=
SHA1 (kslide-0.90.tar.bz2) = us4jA3GXZJWfZ953zjtMuMxA5Bo=
SHA256 (kslide-0.90.tar.bz2) = CqVP3k+X70gchpeT+Pi3SasQEivb+1bGORBIjaEpTSk=
SIZE (kslide-0.90.tar.bz2) = 765283
SHA256 (kslide-1.0.1.tar.bz2) = R3GaeQksd3jB7f7R5KQsv1XOoPTgod0xZ0S+3qfEk3w=
SIZE (kslide-1.0.1.tar.bz2) = 1105579

31
games/kslide/patches/patch-kslide_Makefile_in
View File

@ -1,18 +1,13 @@
--- kslide/Makefile.in.orig Sun Feb 3 18:41:03 2002
+++ kslide/Makefile.in Sat Jan 18 21:39:07 2003
@@ -231,13 +231,13 @@ AUTOMAKE_OPTIONS = foreign
APPSDIR = $(kde_appsdir)/Games
INCLUDES = @all_includes@
LIBS = @all_libraries@
-CPPFLAGS = -DSTDC_HEADERS -Wall -O3
+CPPFLAGS = -DSTDC_HEADERS -Wall
bin_PROGRAMS = kslide
kslide_SOURCES = puzzle.cpp puz_app.cpp kslide.cpp cpreferences.cpp playername.cpp score.cpp
kslide_LDFLAGS = @all_libraries@
-kslide_LDADD = -lkdeui -lkdecore -lqt -lX11 -lXext -lkfile
+kslide_LDADD = -lkdeui -lkdecore -lqt-mt -lX11 -lXext -lkio
noinst_HEADERS = puz_app.h puzzle.h cursors.h icons.h cpreferences.h playername.h score.h
$OpenBSD: patch-kslide_Makefile_in,v 1.3 2013/12/19 12:46:16 zhuk Exp $
Unbreak build that was relying on wrong make behaviour.
--- kslide/Makefile.in.orig Thu Dec 19 15:50:15 2013
+++ kslide/Makefile.in Thu Dec 19 15:50:38 2013
@@ -926,7 +926,7 @@ kslide.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ci
echo "#define KDE_USE_FINAL 1" >> kslide.all_cpp.final; \
for file in cintro.cpp score.cpp puzzle.cpp puz_app.cpp playername.cpp cpreferences.cpp main.cpp playername.moc.cpp cpreferences.moc.cpp cintro.moc.cpp score.moc.cpp puzzle.moc.cpp puz_app.moc.cpp ; do \
echo "#include \"$$file\"" >> kslide.all_cpp.files; \
- test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kslide.all_cpp.final; \
+ test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> kslide.all_cpp.final || true; \
done; \
cat kslide.all_cpp.final kslide.all_cpp.files > kslide.all_cpp.cpp; \
rm -f kslide.all_cpp.final kslide.all_cpp.files

21
games/kslide/patches/patch-kslide_cintro_cpp Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-kslide_cintro_cpp,v 1.1 2013/12/19 12:46:16 zhuk Exp $
Avoid requiring -lcompat.
--- kslide/cintro.cpp.orig Fri Jun 28 00:19:31 2013
+++ kslide/cintro.cpp Fri Jun 28 00:19:56 2013
@@ -27,6 +27,7 @@
#include <klocale.h>
#include <kdebug.h>
#include <qmessagebox.h>
+#include <pwd.h>
#include <unistd.h>
CIntro::CIntro(){
@@ -86,7 +87,7 @@ CIntro::CIntro(){
playername->hide();
KConfig *config = kapp->config();
config->setGroup("Player");
- playername->setText(config->readEntry("playername",QString(cuserid(NULL))));
+ playername->setText(config->readEntry("playername",QString(getpwuid(getuid())->pw_name)));
playername->selectAll();
setMouseTracking(true);

13
games/kslide/patches/patch-kslide_puz_app_cpp Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-kslide_puz_app_cpp,v 1.1 2013/12/19 12:46:16 zhuk Exp $
Do not show the non-supported option.
--- kslide/puz_app.cpp.orig Thu Dec 19 16:36:22 2013
+++ kslide/puz_app.cpp Thu Dec 19 16:36:01 2013
@@ -204,7 +204,7 @@ void KSlideApp::initActions() {
/* new KAction( i18n("Load image"), 0, this, SLOT(loadImage()), actionCollection(),"load_image");
new KAction( i18n("Default image"), 0, this, SLOT(defaultImage()), actionCollection(),"default_image");
new KAction( i18n("Random image"), 0, this, SLOT(toggleMissingTile()), actionCollection(),"random_file");*/
- new KAction( i18n("Use sound"), 0, this, SLOT(toggleSound()), actionCollection(),"sound");
+// new KAction( i18n("Use sound"), 0, this, SLOT(toggleSound()), actionCollection(),"sound");
hint=new KAction( i18n("Give hint"), 0, puzzle, SLOT(slotGiveHint()), actionCollection(),"hint");
stophint=new KAction( i18n("Stop hint"), 0, puzzle, SLOT(slotStopHint()), actionCollection(),"stop_hint");
new KAction( i18n("Preferences"),"configure", 0, this, SLOT(slotPreferences()), actionCollection(),"preferences");

23
games/kslide/patches/patch-kslide_puzzle_cpp Normal file
View File

@ -0,0 +1,23 @@
$OpenBSD: patch-kslide_puzzle_cpp,v 1.1 2013/12/19 12:46:16 zhuk Exp $
1. Avoid crash at start.
2. Fix type mismatch.
--- kslide/puzzle.cpp.orig Fri Sep 15 20:02:11 2006
+++ kslide/puzzle.cpp Thu Dec 19 15:57:48 2013
@@ -322,7 +322,7 @@ void KSlidePuzzle::mouseMoveEvent(QMouseEvent *event)
{
if (event) // event is 0 if called manually
puz.prevMousePos = event->pos();
- if (isComplete() || isGivingHint() || !isIdle())
+ if (isComplete() || isGivingHint() || !isIdle() || puz.size == 0)
return;
unsigned char c = cuNormal;
int x, y;
@@ -769,7 +769,7 @@ void KSlidePuzzle::slotSaveGame(){
fprintf(stream, "%i %i ",puz.pos[i], puz.movesTo[i]);
}
}
- fprintf(stream, "%i ",tilelist.count());
+ fprintf(stream, "%zi ", (size_t)tilelist.count());
for(i=0;i<tilelist.count();i++) {
QPoint p=*tilelist.at(i);
fprintf(stream, "%i %i", p.x(), p.y());

10
games/kslide/pkg/DESCR
View File

@ -1,5 +1,5 @@
KSlide is a simple puzzle game compatible with the K Desktop Environment.
The playing principle of KSlide is very simple. From a square set of tiles,
one is removed, allowing at least two adjacent tiles to be shifted.
This way, the puzzle is scrambled by the program, and the player's goal
is to restore the original order.
KSlide is a simple puzzle game compatible with the K Desktop
Environment. The playing principle of KSlide is very simple. From
a square set of tiles, one is removed, allowing at least two adjacent
tiles to be shifted. This way, the puzzle is scrambled by the
program, and the player's goal is to restore the original order.

33
games/kslide/pkg/PLIST
View File

@ -1,14 +1,22 @@
@comment $OpenBSD: PLIST,v 1.5 2013/10/22 11:34:15 zhuk Exp $
@comment $OpenBSD: PLIST,v 1.6 2013/12/19 12:46:16 zhuk Exp $
@bin bin/kslide
share/applnk/
share/applnk/Games/
share/applnk/Games/kslide.desktop
share/apps.kde3/
share/applnk/Applications/
share/applnk/Applications/kslide.desktop
share/apps.kde3/kslide/
share/apps.kde3/kslide/kslideui.rc
share/apps.kde3/kslide/pics/
share/apps.kde3/kslide/pics/ball.png
share/apps.kde3/kslide/pics/credits0.png
share/apps.kde3/kslide/pics/credits1.png
share/apps.kde3/kslide/pics/credits2.png
share/apps.kde3/kslide/pics/credits3.png
share/apps.kde3/kslide/pics/frame0.png
share/apps.kde3/kslide/pics/frame0m.png
share/apps.kde3/kslide/pics/frame1.png
share/apps.kde3/kslide/pics/frame2.png
share/apps.kde3/kslide/pics/kslide.jpg
share/apps.kde3/kslide/pics/playername.jpg
share/apps.kde3/kslide/pics/puzzle0.jpg
share/apps.kde3/kslide/pics/puzzle1.jpg
share/apps.kde3/kslide/pics/puzzle2.jpg
@ -17,21 +25,11 @@ share/apps.kde3/kslide/pics/puzzle4.jpg
share/apps.kde3/kslide/pics/puzzle5.jpg
share/apps.kde3/kslide/pics/puzzle6.jpg
share/apps.kde3/kslide/pics/puzzle7.jpg
share/apps.kde3/kslide/pics/texture.jpg
share/apps.kde3/kslide/pics/tiles0.png
share/apps.kde3/kslide/pics/tiles0m.png
share/apps.kde3/kslide/sounds/
share/apps.kde3/kslide/sounds/sound0.wav
share/apps.kde3/kslide/sounds/sound1.wav
share/apps.kde3/kslide/sounds/sound2.wav
share/doc/HTML.kde3/
share/doc/HTML.kde3/de/
share/doc/HTML.kde3/de/kslide/
share/doc/HTML.kde3/de/kslide/index.html
share/doc/HTML.kde3/de/kslide/kde_logo.gif
share/doc/HTML.kde3/en/
share/doc/HTML.kde3/en/kslide/
share/doc/HTML.kde3/en/kslide/index.html
share/doc/HTML.kde3/en/kslide/kde_logo.gif
share/apps.kde3/kslide/pics/tiles1.png
share/apps.kde3/kslide/pics/tiles2.png
share/icons/hicolor/16x16/actions/solve.png
share/icons/hicolor/16x16/apps/kslide.png
share/icons/hicolor/32x32/apps/kslide.png
@ -43,6 +41,7 @@ share/icons/locolor/16x16/apps/kslide.png
share/icons/locolor/32x32/
share/icons/locolor/32x32/apps/
share/icons/locolor/32x32/apps/kslide.png
share/locale/fr/LC_MESSAGES/kslide.mo
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/locolor