From smoberly@mail.karamazov.org  Sat Mar 15 18:19:06 2003
Return-Path: <smoberly@mail.karamazov.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A9B2C37B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 15 Mar 2003 18:19:06 -0800 (PST)
Received: from mail.karamazov.org (h162-040-089-010.adsl.navix.net [162.40.89.10])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 722E743F93
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 15 Mar 2003 18:19:05 -0800 (PST)
	(envelope-from smoberly@mail.karamazov.org)
Received: (from smoberly@localhost)
	by mail.karamazov.org (8.12.8/8.12.8) id h2G2J4wx012837;
	Sat, 15 Mar 2003 20:19:04 -0600 (CST)
	(envelope-from smoberly)
Message-Id: <200303160219.h2G2J4wx012837@mail.karamazov.org>
Date: Sat, 15 Mar 2003 20:19:04 -0600 (CST)
From: "Scott A. Moberly" <smoberly@mail.karamazov.org>
Reply-To: "Scott A. Moberly" <smoberly@mail.karamazov.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Sync kmamerun w/ xmame in ports
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         50041
>Category:       ports
>Synopsis:       Sync kmamerun w/ xmame in ports
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 15 18:20:02 PST 2003
>Closed-Date:    Sun Mar 23 13:57:58 PST 2003
>Last-Modified:  Sun Mar 23 13:57:58 PST 2003
>Originator:     Scott A. Moberly
>Release:        FreeBSD 4.8-RC i386
>Organization:
>Environment:
System: FreeBSD mail.karamazov.org 4.8-RC FreeBSD 4.8-RC #7: Tue Mar 4 11:04:53 CST 2003 smoberly@pavel.karamazov.org:/usr/src/sys/compile/PAVEL i386


>Description:
The version of kmamerun will not work with the updated version
of xmame in the ports .65
>How-To-Repeat:
run the program :)
>Fix:

The following patch files should be added:

# 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:
#
#	kmamerun
#	kmamerun/files
#	kmamerun/files/patch-kmamerun+preferences.cpp
#	kmamerun/files/patch-kmamerun+prefgeneral.cpp
#	kmamerun/files/patch-kmamerun+prefgeneral.h
#	kmamerun/files/patch-kmamerun+prefgeneraldata.cpp
#
echo c - kmamerun
mkdir -p kmamerun > /dev/null 2>&1
echo c - kmamerun/files
mkdir -p kmamerun/files > /dev/null 2>&1
echo x - kmamerun/files/patch-kmamerun+preferences.cpp
sed 's/^X//' >kmamerun/files/patch-kmamerun+preferences.cpp << 'END-of-kmamerun/files/patch-kmamerun+preferences.cpp'
X--- kmamerun/preferences.cpp.orig	Wed Feb 26 21:04:52 2003
X+++ kmamerun/preferences.cpp	Wed Feb 26 21:05:35 2003
X@@ -256,7 +256,7 @@
X         prefGeneral.logdir = "/tmp";
X     mamecmd = prefGeneral.mamecmd;
X     logdir = prefGeneral.logdir;
X-    prefGeneral.spooldir = "";
X+    prefGeneral.hiscoredir = "";
X     prefGeneral.cheat = 0;
X     prefGeneral.version = 37;
X     prefGeneral.check_romsets = false;
X@@ -368,9 +368,9 @@
X             sscanf(line.data(),"%*s%s",buf);
X             prefGeneral.rompath = buf;
X             prefGeneral.version = 34;
X-        } else if (str == "spooldir") {
X+        } else if (str == "hiscoredir") {
X             sscanf(line.data(),"%*s%s",buf);
X-            prefGeneral.spooldir = buf;
X+            prefGeneral.hiscoredir = buf;
X         } else if (str == "screenshotdir") {
X             sscanf(line.data(),"%*s%s",buf);
X             prefGeneral.screenshotdir = buf;
END-of-kmamerun/files/patch-kmamerun+preferences.cpp
echo x - kmamerun/files/patch-kmamerun+prefgeneral.cpp
sed 's/^X//' >kmamerun/files/patch-kmamerun+prefgeneral.cpp << 'END-of-kmamerun/files/patch-kmamerun+prefgeneral.cpp'
X--- kmamerun/prefgeneral.cpp.orig	Wed Feb 26 21:05:03 2003
X+++ kmamerun/prefgeneral.cpp	Wed Feb 26 21:05:35 2003
X@@ -35,7 +35,7 @@
X {
X     checkCheat->setChecked(prefs->cheat);
X     inputMamedir->setText(prefs->rompath);
X-    inputSpooldir->setText(prefs->spooldir);
X+    inputHiscoredir->setText(prefs->hiscoredir);
X     inputMamecmd->setText(prefs->mamecmd);
X     inputLogdir->setText(prefs->logdir);
X     inputImagedir->setText(prefs->screenshotdir);
X@@ -57,7 +57,7 @@
X     str = inputMamedir->text();
X     if (!str.isEmpty())
X         config.writeEntry("rompath",inputMamedir->text());
X-    config.writeEntry("spooldir",inputSpooldir->text());
X+    config.writeEntry("hiscoredir",inputHiscoredir->text());
X     QString
X         cmd = inputMamecmd->text();
X     if (!cmd.isEmpty() && cmd.find("@@Game") < 0) {
X@@ -98,8 +98,8 @@
X         if (!str.isEmpty())
X             prefs->rompath = str;
X     }
X-    if (config.hasKey("spooldir"))
X-        prefs->spooldir = config.readEntry("spooldir");
X+    if (config.hasKey("hiscoredir"))
X+        prefs->hiscoredir = config.readEntry("hiscoredir");
X     if (config.hasKey("mamecmd"))
X         prefs->mamecmd = config.readEntry("mamecmd");
X     if (config.hasKey("logdir"))
X@@ -129,9 +129,9 @@
X 	    opt += prefs->rompath;
X 	}
X     }
X-    if (defpref->spooldir != prefs->spooldir) {
X-	if (!prefs->spooldir.isEmpty())
X-            opt += " -spooldir " + prefs->spooldir;
X+    if (defpref->hiscoredir != prefs->hiscoredir) {
X+	if (!prefs->hiscoredir.isEmpty())
X+            opt += " -hiscore_directory " + prefs->hiscoredir;
X     }
X     if (defpref->screenshotdir != prefs->screenshotdir) {
X 	if (!prefs->screenshotdir.isEmpty())
END-of-kmamerun/files/patch-kmamerun+prefgeneral.cpp
echo x - kmamerun/files/patch-kmamerun+prefgeneral.h
sed 's/^X//' >kmamerun/files/patch-kmamerun+prefgeneral.h << 'END-of-kmamerun/files/patch-kmamerun+prefgeneral.h'
X--- kmamerun/prefgeneral.h.orig	Wed Feb 26 21:05:12 2003
X+++ kmamerun/prefgeneral.h	Wed Feb 26 21:05:37 2003
X@@ -29,7 +29,7 @@
X 
X struct general_prefs {
X     QString rompath;
X-    QString spooldir;
X+    QString hiscoredir;
X     int cheat;
X     // local data
X     QString mamecmd;
X@@ -58,8 +58,8 @@
X 	//Generated area. DO NOT EDIT!!!(begin)
X 	QLabel *labelMamedir;
X 	QLineEdit *inputMamedir;
X-	QLabel *labelSpooldir;
X-	QLineEdit *inputSpooldir;
X+	QLabel *labelHiscoredir;
X+	QLineEdit *inputHiscoredir;
X 	QLabel *labelMamecmd;
X 	QLineEdit *inputMamecmd;
X 	QLabel *labelLogdir;
END-of-kmamerun/files/patch-kmamerun+prefgeneral.h
echo x - kmamerun/files/patch-kmamerun+prefgeneraldata.cpp
sed 's/^X//' >kmamerun/files/patch-kmamerun+prefgeneraldata.cpp << 'END-of-kmamerun/files/patch-kmamerun+prefgeneraldata.cpp'
X--- kmamerun/prefgeneraldata.cpp.orig	Wed Feb 26 21:05:23 2003
X+++ kmamerun/prefgeneraldata.cpp	Wed Feb 26 21:05:35 2003
X@@ -21,14 +21,14 @@
X   inputMamedir->setGeometry(120,10,300,30);
X   inputMamedir->setMinimumSize(0,0);
X 
X-  labelSpooldir= new QLabel(this,"NoName");
X-  labelSpooldir->setGeometry(10,40,110,30);
X-  labelSpooldir->setMinimumSize(0,0);
X-  labelSpooldir->setText(i18n("Hiscore directory:"));
X+  labelHiscoredir= new QLabel(this,"NoName");
X+  labelHiscoredir->setGeometry(10,40,110,30);
X+  labelHiscoredir->setMinimumSize(0,0);
X+  labelHiscoredir->setText(i18n("Hiscore directory:"));
X 
X-  inputSpooldir= new QLineEdit(this,"NoName");
X-  inputSpooldir->setGeometry(120,40,300,30);
X-  inputSpooldir->setMinimumSize(0,0);
X+  inputHiscoredir= new QLineEdit(this,"NoName");
X+  inputHiscoredir->setGeometry(120,40,300,30);
X+  inputHiscoredir->setMinimumSize(0,0);
X 
X   labelMamecmd= new QLabel(this,"NoName");
X   labelMamecmd->setGeometry(10,70,110,30);
END-of-kmamerun/files/patch-kmamerun+prefgeneraldata.cpp
exit

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: arved 
State-Changed-When: Sun Mar 23 13:57:49 PST 2003 
State-Changed-Why:  
Committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=50041 
>Unformatted:
