rpms/guitone/devel guitone-0.8-update-crash.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 guitone.spec, 1.4, 1.5 sources, 1.3, 1.4 guitone-0.7-gcc43.patch, 1.1, NONE guitone-0.7-qt-svg.patch, 1.1, NONE

[Thomas Moschny (thm)]

Author: thm

Update of /cvs/pkgs/rpms/guitone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3603/devel

Modified Files:
	.cvsignore guitone.spec sources 
Added Files:
	guitone-0.8-update-crash.patch 
Removed Files:
	guitone-0.7-gcc43.patch guitone-0.7-qt-svg.patch 
Log Message:
Update to version 8.0

guitone-0.8-update-crash.patch:

--- NEW FILE guitone-0.8-update-crash.patch ---
#
# old_revision [cc6fc7c629783c617b983608d7944081cdec8188]
#
# patch "NEWS"
#  from [650c6f31c4d3d4348cec5b8d5e15bf56a7164d31]
#    to [1e04804ab9e317a275c1d76b5bbbe22e1126aae7]
# 
# patch "src/view/DatabaseWindow.cpp"
#  from [8b79e24eafcad06564f61974b3b1049304c9f792]
#    to [37323d919fecd0fda6c5266a8af16203b88edf04]
# 
# patch "src/view/DatabaseWindow.h"
#  from [aea7b282e9aa43a7d82f2fd9ead8e094a4f56621]
#    to [619c1ab06edb685d2db3381db9ea5bb31481c546]
# 
# patch "src/view/WorkspaceWindow.cpp"
#  from [9ae0a5ea1f3095ecc8824221b1d1523956942144]
#    to [c43d9bb26897d081b01a429d3329c244143abb38]
#
============================================================
--- NEWS	650c6f31c4d3d4348cec5b8d5e15bf56a7164d31
+++ NEWS	1e04804ab9e317a275c1d76b5bbbe22e1126aae7
@@ -1,3 +1,7 @@
+????-??-?? (0.9)
+ - bugfix: in workspace mode the database variables panel has not been
+   initialized, thus guitone crashed when "update" was clicked
+
 2008-05-25 (0.8)
  - starting from this version (0.8) guitone is distributed under the terms
    of the GNU General Public License Version 3
============================================================
--- src/view/DatabaseWindow.cpp	8b79e24eafcad06564f61974b3b1049304c9f792
+++ src/view/DatabaseWindow.cpp	37323d919fecd0fda6c5266a8af16203b88edf04
@@ -55,11 +55,6 @@ void DatabaseWindow::init()
     if (!dialogManager)
     {
         dialogManager = new DatabaseDialogManager(this);
-
-        connect(
-            this, SIGNAL(databaseSelected(const DatabaseFile &)),
-            dialogManager, SLOT(init(const DatabaseFile &))
-        );
     }
 
     connect(
@@ -84,11 +79,6 @@ void DatabaseWindow::init()
 
     databaseVariables = new DatabaseVariables(this);
 
-    connect(
-        this, SIGNAL(databaseSelected(const DatabaseFile &)),
-        databaseVariables, SLOT(setDatabaseFile(const DatabaseFile &))
-    );
-
     dynamic_cast<DatabaseMenuBar *>(menuBar)
         ->addDockWidgetAction(databaseVariables->toggleViewAction());
 
@@ -158,6 +148,7 @@ void DatabaseWindow::load(const QString 
 
     Settings::addItemToList("RecentDatabaseList", path, 5);
 
-    emit databaseSelected(databaseFile);
+	reinterpret_cast<DatabaseDialogManager *>(dialogManager)->init(databaseFile);
+	databaseVariables->setDatabaseFile(databaseFile);
 }
 
============================================================
--- src/view/DatabaseWindow.h	aea7b282e9aa43a7d82f2fd9ead8e094a4f56621
+++ src/view/DatabaseWindow.h	619c1ab06edb685d2db3381db9ea5bb31481c546
@@ -37,9 +37,6 @@ public:
     //! throws GuitoneException
     virtual void load(const QString &);
 
-signals:
-    void databaseSelected(const DatabaseFile &);
-
 protected:
     DatabaseFile databaseFile;
 
============================================================
--- src/view/WorkspaceWindow.cpp	9ae0a5ea1f3095ecc8824221b1d1523956942144
+++ src/view/WorkspaceWindow.cpp	c43d9bb26897d081b01a429d3329c244143abb38
@@ -292,6 +292,9 @@ void WorkspaceWindow::load(const QString
     invWatcher->setWorkspacePath(workspacePath);
     attrModel->setWorkspacePath(workspacePath);
 
+    DatabaseFile dbfile = APP->manager()->getDatabaseFilePath(workspacePath);
+    databaseVariables->setDatabaseFile(dbfile);
+
     // read the inventory
     invModel->refresh();
 }


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/guitone/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Apr 2008 10:07:01 -0000	1.3
+++ .cvsignore	27 May 2008 23:42:59 -0000	1.4
@@ -1 +1 @@
-guitone-0.7.1.tgz
+guitone-0.8.tgz


Index: guitone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guitone/devel/guitone.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- guitone.spec	6 Apr 2008 10:07:01 -0000	1.4
+++ guitone.spec	27 May 2008 23:42:59 -0000	1.5
@@ -1,18 +1,19 @@
 Name:		guitone
-Version:	0.7.1
+Version:	0.8
 Release:	1%{?dist}
 
 Summary:	A frontend for Monotone
 Group:		Development/Tools
-License:	GPLv2+
+License:	GPLv3+
 
 URL:		http://guitone.thomaskeller.biz/
 Source0:	%{url}releases/%{version}/%{name}-%{version}.tgz
 
-Patch0:		guitone-0.7-qt-svg.patch
-Patch1:		guitone-0.7-gcc43.patch
+Patch0:		guitone-0.8-update-crash.patch
 
-BuildRequires:	qt4-devel
+# Note: License is now GPLv3+.  According to upstream this forces us
+# to build against qt >= 4.3.4.
+BuildRequires:	qt4-devel >= 4.3.4
 BuildRequires:	desktop-file-utils
 Requires:	monotone
 
@@ -40,8 +41,8 @@
 
 %prep
 %setup -q
-%patch0 -p0 -b .qt-svg
-%patch1 -p0 -b .gcc43
+%patch0 -p0 -b .update-crash
+
 
 cat >%{name}.desktop <<EOF
 [Desktop Entry]
@@ -90,6 +91,11 @@
 
 
 %changelog
+* Mon May 26 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.8-1
+- Update to upstream version 0.8.
+- Add a zero-day patch from upstream.
+- License is GPLv3+ now.
+
 * Sun Apr  6 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.7.1-1
 - Update to upstream version 0.7.1.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/guitone/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Apr 2008 10:07:01 -0000	1.3
+++ sources	27 May 2008 23:42:59 -0000	1.4
@@ -1 +1 @@
-a7a6965a1879e72b697e135d60979d16  guitone-0.7.1.tgz
+dda9bd351639a780bd5d63303daf5615  guitone-0.8.tgz


--- guitone-0.7-gcc43.patch DELETED ---


--- guitone-0.7-qt-svg.patch DELETED ---