[packages/cdcat] - up to 2.3.1 - removed outdated patches - updated BRs

baggins baggins at pld-linux.org
Sun Dec 8 17:15:26 CET 2013


commit 624324bdb1ed2496ccfddbe7c490d7c74921fcfe
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Dec 8 17:15:07 2013 +0100

    - up to 2.3.1
    - removed outdated patches
    - updated BRs

 cdcat-fstab.patch      | 35 -----------------------------------
 cdcat-gcc4.patch       | 11 -----------
 docfiles-install.patch | 12 ------------
 3 files changed, 58 deletions(-)
---
diff --git a/cdcat-fstab.patch b/cdcat-fstab.patch
deleted file mode 100644
index 3a0291e..0000000
--- a/cdcat-fstab.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/misc.cpp.orig	2006-11-19 18:30:08.538643734 +0100
-+++ src/misc.cpp	2006-11-19 18:34:41.635711234 +0100
-@@ -32,6 +32,7 @@
-    
-    QFile f("/etc/fstab");
-    QString line;
-+   QRegExp separator("\\s+");
- 
-    if (f.open(IO_ReadOnly)) 
-     {	// file opened successfully
-@@ -39,18 +40,15 @@
- 
-      while (!t.eof()) 
-        {
--         line = t.readLine();	// line of text excluding '\n'
-+         line = t.readLine().simplifyWhiteSpace();	// line of text excluding '\n'
- 	 
-          if(!line.startsWith("#") && !line.isEmpty()) 
- 	   {
--             if(((line.section("\t",1,1,QString::SectionSkipEmpty)).replace(QRegExp("/$"),"")).compare(cfgcdpath) == 0)
--	       {
--	        strcpy(devicename,(const char *)line.section("\t",0,0));
--	       }     	
--	     if(((line.section(" " ,1,1,QString::SectionSkipEmpty)).replace(QRegExp("/$"),"")).compare(cfgcdpath) == 0) 
--	       {
--	        strcpy(devicename,(const char *)line.section(" " ,0,0));	       
--	       }
-+		if(line.section(separator, 1, 1, QString::SectionSkipEmpty).compare(cfgcdpath) == 0)
-+		{
-+			strncpy(devicename, (const char *) line.section(separator, 0, 0), 63);
-+			break;
-+		}
-            } 
-        }
-      f.close();
diff --git a/cdcat-gcc4.patch b/cdcat-gcc4.patch
deleted file mode 100644
index 9ab27f2..0000000
--- a/cdcat-gcc4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/import.h~	2005-08-22 19:03:00.000000000 +0200
-+++ src/import.h	2006-07-18 23:46:52.943244250 +0200
-@@ -66,7 +66,7 @@
- 
- class importGtktalogCsv: public QObject {
- Q_OBJECT public:
--	importGtktalogCsv::importGtktalogCsv( GuiSlave * parent, QString separator, QString filename, bool createdatabase, bool correctbadstyle );
-+	importGtktalogCsv( GuiSlave * parent, QString separator, QString filename, bool createdatabase, bool correctbadstyle );
- 	~importGtktalogCsv();
- 
- 	/*
diff --git a/docfiles-install.patch b/docfiles-install.patch
deleted file mode 100644
index 695044b..0000000
--- a/docfiles-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- cdcat-1.2-orig/src/cdcat.pro	2011-02-10 12:08:23.000000000 +0100
-+++ cdcat-1.2/src/cdcat.pro	2011-03-08 15:52:24.994464509 +0100
-@@ -93,7 +93,8 @@
- 
- 
- unix:distfiles.files +=   ../README_CSV_IMPORT ../Authors ../README ../ChangeLog \
--                          ../COPYING ../TRANSLATORS_README ../cdcat.png 
-+                          ../README_IMPORT ../TRANSLATORS_README ../README_IMPORT.HU ../README_IMPORT.DE \
-+			  ../cdcat.png 
- unix:distfiles.path =     /usr/local/share/cdcat
- unix:target.path +=       /usr/local/bin
- unix:translations.path += /usr/local/share/cdcat/translations
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cdcat.git/commitdiff/624324bdb1ed2496ccfddbe7c490d7c74921fcfe



More information about the pld-cvs-commit mailing list