summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/amarok-kde4/Makefile3
-rw-r--r--audio/amarok-kde4/distinfo5
-rw-r--r--audio/amarok-kde4/files/patch-amarok_src_collectiondb.cpp91
-rw-r--r--audio/amarok-kde4/pkg-plist26
-rw-r--r--audio/amarok/Makefile3
-rw-r--r--audio/amarok/distinfo5
-rw-r--r--audio/amarok/files/patch-amarok_src_collectiondb.cpp91
-rw-r--r--audio/amarok/pkg-plist26
8 files changed, 58 insertions, 192 deletions
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 34acabdd6c78..d197e33e9c8b 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= amarok
-PORTVERSION= 1.3.5
-PORTREVISION= 1
+PORTVERSION= 1.3.6
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/audio/amarok-kde4/distinfo b/audio/amarok-kde4/distinfo
index e459e283f4eb..4b02a632ba72 100644
--- a/audio/amarok-kde4/distinfo
+++ b/audio/amarok-kde4/distinfo
@@ -1,2 +1,3 @@
-MD5 (amarok-1.3.5.tar.bz2) = faac790ea432a784fa7d1ac6a34ee410
-SIZE (amarok-1.3.5.tar.bz2) = 8450003
+MD5 (amarok-1.3.6.tar.bz2) = f97ac51a8c2f150ffc4cc0ef49c59a2f
+SHA256 (amarok-1.3.6.tar.bz2) = 10f2006d80508baceb2b6c6a2e6bb940cc538b1ad3967ba4b6a68e8b3b2a97bc
+SIZE (amarok-1.3.6.tar.bz2) = 8649808
diff --git a/audio/amarok-kde4/files/patch-amarok_src_collectiondb.cpp b/audio/amarok-kde4/files/patch-amarok_src_collectiondb.cpp
deleted file mode 100644
index a5bd6957c572..000000000000
--- a/audio/amarok-kde4/files/patch-amarok_src_collectiondb.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-
-$FreeBSD$
-
---- amarok/src/collectiondb.cpp.orig
-+++ amarok/src/collectiondb.cpp
-@@ -290,15 +290,18 @@
- QString yearAutoIncrement = "";
- if ( m_dbConnPool->getDbConnectionType() == DbConnection::postgresql )
- {
-- query( QString( "CREATE %1 SEQUENCE album_seq%2;" ).arg( conn ? "TEMPORARY" : "").arg( conn ? "_temp" : ""), conn );
-- query( QString( "CREATE %1 SEQUENCE artist_seq%2;" ).arg( conn ? "TEMPORARY" : "").arg( conn ? "_temp" : ""), conn );
-- query( QString( "CREATE %1 SEQUENCE genre_seq%2;" ).arg( conn ? "TEMPORARY" : "").arg( conn ? "_temp" : ""), conn );
-- query( QString( "CREATE %1 SEQUENCE year_seq%2;" ).arg( conn ? "TEMPORARY" : "").arg( conn ? "_temp" : ""), conn );
-+ if(!conn)
-+ {
-+ query( QString( "CREATE SEQUENCE album_seq;" ), conn );
-+ query( QString( "CREATE SEQUENCE artist_seq;" ), conn );
-+ query( QString( "CREATE SEQUENCE genre_seq;" ), conn );
-+ query( QString( "CREATE SEQUENCE year_seq;" ), conn );
-+ }
-
-- albumAutoIncrement = QString("DEFAULT nextval('album_seq%1')").arg( conn ? "_temp" : "");
-- artistAutoIncrement = QString("DEFAULT nextval('artist_seq%1')").arg( conn ? "_temp" : "");
-- genreAutoIncrement = QString("DEFAULT nextval('genre_seq%1')").arg( conn ? "_temp" : "");
-- yearAutoIncrement = QString("DEFAULT nextval('year_seq%1')").arg( conn ? "_temp" : "");
-+ albumAutoIncrement = QString("DEFAULT nextval('album_seq')");
-+ artistAutoIncrement = QString("DEFAULT nextval('artist_seq')");
-+ genreAutoIncrement = QString("DEFAULT nextval('genre_seq')");
-+ yearAutoIncrement = QString("DEFAULT nextval('year_seq')");
- }
- else if ( m_dbConnPool->getDbConnectionType() == DbConnection::mysql )
- {
-@@ -412,10 +415,12 @@
-
- if ( m_dbConnPool->getDbConnectionType() == DbConnection::postgresql )
- {
-- query( QString( "DROP SEQUENCE album_seq%1;" ).arg( conn ? "_temp" : ""), conn );
-- query( QString( "DROP SEQUENCE artist_seq%1;" ).arg( conn ? "_temp" : ""), conn );
-- query( QString( "DROP SEQUENCE genre_seq%1;" ).arg( conn ? "_temp" : ""), conn );
-- query( QString( "DROP SEQUENCE year_seq%1;" ).arg( conn ? "_temp" : ""), conn );
-+ if (conn == NULL) {
-+ query( QString( "DROP SEQUENCE album_seq;" ), conn );
-+ query( QString( "DROP SEQUENCE artist_seq;" ), conn );
-+ query( QString( "DROP SEQUENCE genre_seq;" ), conn );
-+ query( QString( "DROP SEQUENCE year_seq;" ), conn );
-+ }
- }
- }
-
-@@ -1461,10 +1466,26 @@
- path = path.left( path.length() - 1 );
-
- if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) {
-- query( QString( "UPDATE directories%1 SET changedate=%2 WHERE dir='%3';")
-- .arg( conn ? "_temp" : "" )
-- .arg( datetime )
-- .arg( escapeString( path ) ), conn );
-+ // REPLACE INTO is not valid SQL for postgres, so we need to check whether we
-+ // should UPDATE() or INSERT()
-+ QStringList values = query(QString("SELECT * FROM directories%1 WHERE dir='%2';")
-+ .arg( conn ? "_temp" : "")
-+ .arg( escapeString( path ) ), conn );
-+
-+ if(values.count() > 0 )
-+ {
-+ query( QString( "UPDATE directories%1 SET changedate=%2 WHERE dir='%3';")
-+ .arg( conn ? "_temp" : "" )
-+ .arg( datetime )
-+ .arg( escapeString( path ) ), conn );
-+ }
-+ else
-+ {
-+ query( QString( "INSERT INTO directories%1 (dir,changedate) VALUES ('%2','%3');")
-+ .arg( conn ? "_temp" : "")
-+ .arg( escapeString( path ) )
-+ .arg( datetime ), conn );
-+ }
- }
- else
- {
-@@ -2429,9 +2450,7 @@
- QString _table = table;
- if (table.find("_temp") > 0) _table = table.left(table.find("_temp"));
-
-- /* this does not work with postgres
-- curvalSql = QString("SELECT currval('%1_seq');").arg(_table); */
-- curvalSql = QString("SELECT last_value FROM %1_seq;").arg(_table);
-+ curvalSql = QString("SELECT currval('%1_seq');").arg(_table);
- result = PQexec(m_db, curvalSql.utf8());
- if (result == NULL)
- {
diff --git a/audio/amarok-kde4/pkg-plist b/audio/amarok-kde4/pkg-plist
index e5919f1d1095..186e273c19da 100644
--- a/audio/amarok-kde4/pkg-plist
+++ b/audio/amarok-kde4/pkg-plist
@@ -428,7 +428,9 @@ share/icons/hicolor/32x32/apps/amarok.png
share/icons/hicolor/48x48/apps/amarok.png
share/icons/hicolor/64x64/apps/amarok.png
share/locale/az/LC_MESSAGES/amarok.mo
+share/locale/be/LC_MESSAGES/amarok.mo
share/locale/bg/LC_MESSAGES/amarok.mo
+share/locale/bn/LC_MESSAGES/amarok.mo
share/locale/br/LC_MESSAGES/amarok.mo
share/locale/ca/LC_MESSAGES/amarok.mo
share/locale/cs/LC_MESSAGES/amarok.mo
@@ -437,21 +439,28 @@ share/locale/da/LC_MESSAGES/amarok.mo
share/locale/de/LC_MESSAGES/amarok.mo
share/locale/el/LC_MESSAGES/amarok.mo
share/locale/en_GB/LC_MESSAGES/amarok.mo
+share/locale/eo/LC_MESSAGES/amarok.mo
share/locale/es/LC_MESSAGES/amarok.mo
share/locale/et/LC_MESSAGES/amarok.mo
share/locale/fi/LC_MESSAGES/amarok.mo
share/locale/fr/LC_MESSAGES/amarok.mo
+share/locale/fy/LC_MESSAGES/amarok.mo
share/locale/ga/LC_MESSAGES/amarok.mo
share/locale/gl/LC_MESSAGES/amarok.mo
share/locale/he/LC_MESSAGES/amarok.mo
share/locale/hi/LC_MESSAGES/amarok.mo
+share/locale/hr/LC_MESSAGES/amarok.mo
share/locale/hu/LC_MESSAGES/amarok.mo
+share/locale/id/LC_MESSAGES/amarok.mo
share/locale/is/LC_MESSAGES/amarok.mo
share/locale/it/LC_MESSAGES/amarok.mo
share/locale/ja/LC_MESSAGES/amarok.mo
share/locale/ko/LC_MESSAGES/amarok.mo
+share/locale/ku/LC_MESSAGES/amarok.mo
+share/locale/lo/LC_MESSAGES/amarok.mo
share/locale/lt/LC_MESSAGES/amarok.mo
share/locale/nb/LC_MESSAGES/amarok.mo
+share/locale/nds/LC_MESSAGES/amarok.mo
share/locale/nl/LC_MESSAGES/amarok.mo
share/locale/nn/LC_MESSAGES/amarok.mo
share/locale/pa/LC_MESSAGES/amarok.mo
@@ -460,13 +469,16 @@ share/locale/pt/LC_MESSAGES/amarok.mo
share/locale/pt_BR/LC_MESSAGES/amarok.mo
share/locale/ro/LC_MESSAGES/amarok.mo
share/locale/ru/LC_MESSAGES/amarok.mo
-share/locale/rw/LC_MESSAGES/amarok.mo
+share/locale/se/LC_MESSAGES/amarok.mo
share/locale/sl/LC_MESSAGES/amarok.mo
+share/locale/sq/LC_MESSAGES/amarok.mo
share/locale/sr/LC_MESSAGES/amarok.mo
share/locale/sr@Latn/LC_MESSAGES/amarok.mo
+share/locale/ss/LC_MESSAGES/amarok.mo
share/locale/sv/LC_MESSAGES/amarok.mo
share/locale/ta/LC_MESSAGES/amarok.mo
share/locale/tg/LC_MESSAGES/amarok.mo
+share/locale/th/LC_MESSAGES/amarok.mo
share/locale/tr/LC_MESSAGES/amarok.mo
share/locale/uk/LC_MESSAGES/amarok.mo
share/locale/uz/LC_MESSAGES/amarok.mo
@@ -479,6 +491,18 @@ share/nls/en_US.US-ASCII
%%XINE%%share/services/amarok_xine-engine.desktop
share/services/amarok_void-engine_plugin.desktop
share/servicetypes/amarok_plugin.desktop
+@dirrm share/locale/fy/LC_MESSAGES
+@dirrm share/locale/fy
+@dirrm share/locale/ku/LC_MESSAGES
+@dirrm share/locale/ku
+@dirrm share/locale/lo/LC_MESSAGES
+@dirrm share/locale/lo
+@dirrm share/locale/nds/LC_MESSAGES
+@dirrm share/locale/nds
+@dirrm share/locale/se/LC_MESSAGES
+@dirrm share/locale/se
+@dirrm share/locale/ss/LC_MESSAGES
+@dirrm share/locale/ss
@dirrm share/locale/uz/LC_MESSAGES
@dirrm share/locale/uz
@dirrm share/doc/HTML/sv/amarok
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 34acabdd6c78..d197e33e9c8b 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -5,8 +5,7 @@
# $FreeBSD$
PORTNAME= amarok
-PORTVERSION= 1.3.5
-PORTREVISION= 1
+PORTVERSION= 1.3.6
CATEGORIES= audio kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index e459e283f4eb..4b02a632ba72 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,2 +1,3 @@
-MD5 (amarok-1.3.5.tar.bz2) = faac790ea432a784fa7d1ac6a34ee410
-SIZE (amarok-1.3.5.tar.bz2) = 8450003
+MD5 (amarok-1.3.6.tar.bz2) = f97ac51a8c2f150ffc4cc0ef49c59a2f
+SHA256 (amarok-1.3.6.tar.bz2) = 10f2006d80508baceb2b6c6a2e6bb940cc538b1ad3967ba4b6a68e8b3b2a97bc
+SIZE (amarok-1.3.6.tar.bz2) = 8649808
diff --git a/audio/amarok/files/patch-amarok_src_collectiondb.cpp b/audio/amarok/files/patch-amarok_src_collectiondb.cpp
deleted file mode 100644
index a5bd6957c572..000000000000
--- a/audio/amarok/files/patch-amarok_src_collectiondb.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-
-$FreeBSD$
-
---- amarok/src/collectiondb.cpp.orig
-+++ amarok/src/collectiondb.cpp
-@@ -290,15 +290,18 @@
- QString yearAutoIncrement = "";
- if ( m_dbConnPool->getDbConnectionType() == DbConnection::postgresql )
- {
-- query( QString( "CREATE %1 SEQUENCE album_seq%2;" ).arg( conn ? "TEMPORARY" : "").arg( conn ? "_temp" : ""), conn );
-- query( QString( "CREATE %1 SEQUENCE artist_seq%2;" ).arg( conn ? "TEMPORARY" : "").arg( conn ? "_temp" : ""), conn );
-- query( QString( "CREATE %1 SEQUENCE genre_seq%2;" ).arg( conn ? "TEMPORARY" : "").arg( conn ? "_temp" : ""), conn );
-- query( QString( "CREATE %1 SEQUENCE year_seq%2;" ).arg( conn ? "TEMPORARY" : "").arg( conn ? "_temp" : ""), conn );
-+ if(!conn)
-+ {
-+ query( QString( "CREATE SEQUENCE album_seq;" ), conn );
-+ query( QString( "CREATE SEQUENCE artist_seq;" ), conn );
-+ query( QString( "CREATE SEQUENCE genre_seq;" ), conn );
-+ query( QString( "CREATE SEQUENCE year_seq;" ), conn );
-+ }
-
-- albumAutoIncrement = QString("DEFAULT nextval('album_seq%1')").arg( conn ? "_temp" : "");
-- artistAutoIncrement = QString("DEFAULT nextval('artist_seq%1')").arg( conn ? "_temp" : "");
-- genreAutoIncrement = QString("DEFAULT nextval('genre_seq%1')").arg( conn ? "_temp" : "");
-- yearAutoIncrement = QString("DEFAULT nextval('year_seq%1')").arg( conn ? "_temp" : "");
-+ albumAutoIncrement = QString("DEFAULT nextval('album_seq')");
-+ artistAutoIncrement = QString("DEFAULT nextval('artist_seq')");
-+ genreAutoIncrement = QString("DEFAULT nextval('genre_seq')");
-+ yearAutoIncrement = QString("DEFAULT nextval('year_seq')");
- }
- else if ( m_dbConnPool->getDbConnectionType() == DbConnection::mysql )
- {
-@@ -412,10 +415,12 @@
-
- if ( m_dbConnPool->getDbConnectionType() == DbConnection::postgresql )
- {
-- query( QString( "DROP SEQUENCE album_seq%1;" ).arg( conn ? "_temp" : ""), conn );
-- query( QString( "DROP SEQUENCE artist_seq%1;" ).arg( conn ? "_temp" : ""), conn );
-- query( QString( "DROP SEQUENCE genre_seq%1;" ).arg( conn ? "_temp" : ""), conn );
-- query( QString( "DROP SEQUENCE year_seq%1;" ).arg( conn ? "_temp" : ""), conn );
-+ if (conn == NULL) {
-+ query( QString( "DROP SEQUENCE album_seq;" ), conn );
-+ query( QString( "DROP SEQUENCE artist_seq;" ), conn );
-+ query( QString( "DROP SEQUENCE genre_seq;" ), conn );
-+ query( QString( "DROP SEQUENCE year_seq;" ), conn );
-+ }
- }
- }
-
-@@ -1461,10 +1466,26 @@
- path = path.left( path.length() - 1 );
-
- if (m_dbConnPool->getDbConnectionType() == DbConnection::postgresql) {
-- query( QString( "UPDATE directories%1 SET changedate=%2 WHERE dir='%3';")
-- .arg( conn ? "_temp" : "" )
-- .arg( datetime )
-- .arg( escapeString( path ) ), conn );
-+ // REPLACE INTO is not valid SQL for postgres, so we need to check whether we
-+ // should UPDATE() or INSERT()
-+ QStringList values = query(QString("SELECT * FROM directories%1 WHERE dir='%2';")
-+ .arg( conn ? "_temp" : "")
-+ .arg( escapeString( path ) ), conn );
-+
-+ if(values.count() > 0 )
-+ {
-+ query( QString( "UPDATE directories%1 SET changedate=%2 WHERE dir='%3';")
-+ .arg( conn ? "_temp" : "" )
-+ .arg( datetime )
-+ .arg( escapeString( path ) ), conn );
-+ }
-+ else
-+ {
-+ query( QString( "INSERT INTO directories%1 (dir,changedate) VALUES ('%2','%3');")
-+ .arg( conn ? "_temp" : "")
-+ .arg( escapeString( path ) )
-+ .arg( datetime ), conn );
-+ }
- }
- else
- {
-@@ -2429,9 +2450,7 @@
- QString _table = table;
- if (table.find("_temp") > 0) _table = table.left(table.find("_temp"));
-
-- /* this does not work with postgres
-- curvalSql = QString("SELECT currval('%1_seq');").arg(_table); */
-- curvalSql = QString("SELECT last_value FROM %1_seq;").arg(_table);
-+ curvalSql = QString("SELECT currval('%1_seq');").arg(_table);
- result = PQexec(m_db, curvalSql.utf8());
- if (result == NULL)
- {
diff --git a/audio/amarok/pkg-plist b/audio/amarok/pkg-plist
index e5919f1d1095..186e273c19da 100644
--- a/audio/amarok/pkg-plist
+++ b/audio/amarok/pkg-plist
@@ -428,7 +428,9 @@ share/icons/hicolor/32x32/apps/amarok.png
share/icons/hicolor/48x48/apps/amarok.png
share/icons/hicolor/64x64/apps/amarok.png
share/locale/az/LC_MESSAGES/amarok.mo
+share/locale/be/LC_MESSAGES/amarok.mo
share/locale/bg/LC_MESSAGES/amarok.mo
+share/locale/bn/LC_MESSAGES/amarok.mo
share/locale/br/LC_MESSAGES/amarok.mo
share/locale/ca/LC_MESSAGES/amarok.mo
share/locale/cs/LC_MESSAGES/amarok.mo
@@ -437,21 +439,28 @@ share/locale/da/LC_MESSAGES/amarok.mo
share/locale/de/LC_MESSAGES/amarok.mo
share/locale/el/LC_MESSAGES/amarok.mo
share/locale/en_GB/LC_MESSAGES/amarok.mo
+share/locale/eo/LC_MESSAGES/amarok.mo
share/locale/es/LC_MESSAGES/amarok.mo
share/locale/et/LC_MESSAGES/amarok.mo
share/locale/fi/LC_MESSAGES/amarok.mo
share/locale/fr/LC_MESSAGES/amarok.mo
+share/locale/fy/LC_MESSAGES/amarok.mo
share/locale/ga/LC_MESSAGES/amarok.mo
share/locale/gl/LC_MESSAGES/amarok.mo
share/locale/he/LC_MESSAGES/amarok.mo
share/locale/hi/LC_MESSAGES/amarok.mo
+share/locale/hr/LC_MESSAGES/amarok.mo
share/locale/hu/LC_MESSAGES/amarok.mo
+share/locale/id/LC_MESSAGES/amarok.mo
share/locale/is/LC_MESSAGES/amarok.mo
share/locale/it/LC_MESSAGES/amarok.mo
share/locale/ja/LC_MESSAGES/amarok.mo
share/locale/ko/LC_MESSAGES/amarok.mo
+share/locale/ku/LC_MESSAGES/amarok.mo
+share/locale/lo/LC_MESSAGES/amarok.mo
share/locale/lt/LC_MESSAGES/amarok.mo
share/locale/nb/LC_MESSAGES/amarok.mo
+share/locale/nds/LC_MESSAGES/amarok.mo
share/locale/nl/LC_MESSAGES/amarok.mo
share/locale/nn/LC_MESSAGES/amarok.mo
share/locale/pa/LC_MESSAGES/amarok.mo
@@ -460,13 +469,16 @@ share/locale/pt/LC_MESSAGES/amarok.mo
share/locale/pt_BR/LC_MESSAGES/amarok.mo
share/locale/ro/LC_MESSAGES/amarok.mo
share/locale/ru/LC_MESSAGES/amarok.mo
-share/locale/rw/LC_MESSAGES/amarok.mo
+share/locale/se/LC_MESSAGES/amarok.mo
share/locale/sl/LC_MESSAGES/amarok.mo
+share/locale/sq/LC_MESSAGES/amarok.mo
share/locale/sr/LC_MESSAGES/amarok.mo
share/locale/sr@Latn/LC_MESSAGES/amarok.mo
+share/locale/ss/LC_MESSAGES/amarok.mo
share/locale/sv/LC_MESSAGES/amarok.mo
share/locale/ta/LC_MESSAGES/amarok.mo
share/locale/tg/LC_MESSAGES/amarok.mo
+share/locale/th/LC_MESSAGES/amarok.mo
share/locale/tr/LC_MESSAGES/amarok.mo
share/locale/uk/LC_MESSAGES/amarok.mo
share/locale/uz/LC_MESSAGES/amarok.mo
@@ -479,6 +491,18 @@ share/nls/en_US.US-ASCII
%%XINE%%share/services/amarok_xine-engine.desktop
share/services/amarok_void-engine_plugin.desktop
share/servicetypes/amarok_plugin.desktop
+@dirrm share/locale/fy/LC_MESSAGES
+@dirrm share/locale/fy
+@dirrm share/locale/ku/LC_MESSAGES
+@dirrm share/locale/ku
+@dirrm share/locale/lo/LC_MESSAGES
+@dirrm share/locale/lo
+@dirrm share/locale/nds/LC_MESSAGES
+@dirrm share/locale/nds
+@dirrm share/locale/se/LC_MESSAGES
+@dirrm share/locale/se
+@dirrm share/locale/ss/LC_MESSAGES
+@dirrm share/locale/ss
@dirrm share/locale/uz/LC_MESSAGES
@dirrm share/locale/uz
@dirrm share/doc/HTML/sv/amarok
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 13:11:02 +0000