Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package pentobi for openSUSE:Factory checked
in at 2023-07-18 21:55:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pentobi (Old)
and /work/SRC/openSUSE:Factory/.pentobi.new.3193 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pentobi"
Tue Jul 18 21:55:00 2023 rev:8 rq:1098989 version:23.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/pentobi/pentobi.changes 2023-03-09
17:45:31.530839414 +0100
+++ /work/SRC/openSUSE:Factory/.pentobi.new.3193/pentobi.changes
2023-07-18 21:55:18.314689105 +0200
@@ -1,0 +2,7 @@
+Sun Jul 16 11:00:16 UTC 2023 - Dirk Müller <dmuel...@suse.com>
+
+- update to 23.1:
+ * Overwriting game file on Android with shorter file created
+ corrupted file.
+
+-------------------------------------------------------------------
Old:
----
pentobi-23.0.tar.xz
New:
----
pentobi-23.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pentobi.spec ++++++
--- /var/tmp/diff_new_pack.O7SXm5/_old 2023-07-18 21:55:18.770691655 +0200
+++ /var/tmp/diff_new_pack.O7SXm5/_new 2023-07-18 21:55:18.774691677 +0200
@@ -17,7 +17,7 @@
Name: pentobi
-Version: 23.0
+Version: 23.1
Release: 0
Summary: Program to play the board game Blokus
License: GPL-3.0-only
++++++ pentobi-23.0.tar.xz -> pentobi-23.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pentobi-23.0/CMakeLists.txt
new/pentobi-23.1/CMakeLists.txt
--- old/pentobi-23.0/CMakeLists.txt 2023-03-06 11:07:01.000000000 +0100
+++ new/pentobi-23.1/CMakeLists.txt 2023-03-12 09:08:40.000000000 +0100
@@ -1,8 +1,8 @@
cmake_minimum_required(VERSION 3.19)
project(pentobi CXX)
-set(PENTOBI_VERSION 23.0)
-set(PENTOBI_RELEASE_DATE 2023-03-06)
+set(PENTOBI_VERSION 23.1)
+set(PENTOBI_RELEASE_DATE 2023-03-12)
include(GNUInstallDirs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pentobi-23.0/INSTALL.md new/pentobi-23.1/INSTALL.md
--- old/pentobi-23.0/INSTALL.md 2023-03-06 11:07:01.000000000 +0100
+++ new/pentobi-23.1/INSTALL.md 2023-03-12 09:08:40.000000000 +0100
@@ -18,8 +18,7 @@
In Debian 12, they can be installed with the command
```
sudo apt install cmake docbook-xsl g++ gettext itstool librsvg2-bin \
- make qml6-module-qt-labs-folderlistmodel \
- qml6-module-qt-labs-platform qml6-module-qt-labs-settings \
+ make qml6-module-qt-labs-platform qml6-module-qt-labs-settings \
qml6-module-qtqml-workerscript qml6-module-qtquick-controls \
qml6-module-qtquick-dialogs qml6-module-qtquick-layouts \
qml6-module-qtquick-templates qml6-module-qtquick-window \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pentobi-23.0/NEWS.md new/pentobi-23.1/NEWS.md
--- old/pentobi-23.0/NEWS.md 2023-03-06 11:07:01.000000000 +0100
+++ new/pentobi-23.1/NEWS.md 2023-03-12 09:08:40.000000000 +0100
@@ -1,6 +1,12 @@
Pentobi Release Notes
=====================
+Version 23.1 (12 Mar 2023)
+--------------------------
+
+* Overwriting game file on Android with shorter file created corrupted
+ file.
+
Version 23.0 (06 Mar 2023)
--------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pentobi-23.0/pentobi/AndroidUtils.cpp
new/pentobi-23.1/pentobi/AndroidUtils.cpp
--- old/pentobi-23.0/pentobi/AndroidUtils.cpp 2023-03-06 11:07:01.000000000
+0100
+++ new/pentobi-23.1/pentobi/AndroidUtils.cpp 2023-03-12 09:08:40.000000000
+0100
@@ -45,8 +45,7 @@
}
};
-void takePersistableUriPermission(const QJniObject& intent,
- const QJniObject& uri);
+void takePersistableUriPermission(const QJniObject& uri);
QJniObject getContext()
{
@@ -78,7 +77,7 @@
"[Ljava/lang/String;Ljava/lang/String;)"
"Landroid/database/Cursor;",
uri.object(), projection, nullptr, nullptr, nullptr);
- if (env->ExceptionCheck())
+ if (! cursor.isValid())
return {};
AutoClose autoClose{cursor};
if (! cursor.callMethod<jboolean>("moveToFirst"))
@@ -183,26 +182,23 @@
if (! uriString.isValid())
return;
if (takePersistablePermission)
- takePersistableUriPermission(data, uri);
+ takePersistableUriPermission(uri);
auto displayName = getDisplayName(uri);
callback(uriString.toString(), displayName);
});
}
-void takePersistableUriPermission(const QJniObject& intent,
- const QJniObject& uri)
+void takePersistableUriPermission(const QJniObject& uri)
{
auto contentResolver = getContentResolver();
if (! contentResolver.isValid())
return;
- auto flags = intent.callMethod<jint>("getFlags");
- auto flagRead = QJniObject::getStaticField<jint>(
- "android/content/Intent", "FLAG_GRANT_READ_URI_PERMISSION");
- auto flagWrite = QJniObject::getStaticField<jint>(
- "android/content/Intent", "FLAG_GRANT_WRITE_URI_PERMISSION");
contentResolver.callMethod<void>(
"takePersistableUriPermission", "(Landroid/net/Uri;I)V",
- uri.object(), flags & (flagRead | flagWrite));
+ uri.object(),
+ 0x00000001 // FLAG_GRANT_READ_URI_PERMISSION
+ | 0x00000002 // FLAG_GRANT_WRITE_URI_PERMISSION
+ );
}
#endif
@@ -524,7 +520,9 @@
return false;
auto outputStream = contentResolver.callObjectMethod(
"openOutputStream",
- "(Landroid/net/Uri;)Ljava/io/OutputStream;", uriObj.object());
+ "(Landroid/net/Uri;Ljava/lang/String;)Ljava/io/OutputStream;",
+ uriObj.object(),
+ QJniObject::fromString("wt").object<jstring>());
QJniEnvironment env;
if (checkException())
return false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pentobi-23.0/pentobi/CMakeLists.txt
new/pentobi-23.1/pentobi/CMakeLists.txt
--- old/pentobi-23.0/pentobi/CMakeLists.txt 2023-03-06 11:07:01.000000000
+0100
+++ new/pentobi-23.1/pentobi/CMakeLists.txt 2023-03-12 09:08:40.000000000
+0100
@@ -156,6 +156,8 @@
target_link_libraries(pentobi PRIVATE Qt::CorePrivate)
set_property(TARGET pentobi APPEND PROPERTY
QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/android)
+ set_property(TARGET pentobi APPEND PROPERTY
+ QT_ANDROID_TARGET_SDK_VERSION 31)
else()
install(TARGETS pentobi)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pentobi-23.0/pentobi/GameModel.cpp
new/pentobi-23.1/pentobi/GameModel.cpp
--- old/pentobi-23.0/pentobi/GameModel.cpp 2023-03-06 11:07:01.000000000
+0100
+++ new/pentobi-23.1/pentobi/GameModel.cpp 2023-03-12 09:08:40.000000000
+0100
@@ -1482,25 +1482,6 @@
return suggestFileName(folder, QStringLiteral("blksgf"));
}
-QString GameModel::suggestNewFolderName(const QUrl& folder)
-{
- auto localFolder = folder.toLocalFile();
- QString file = localFolder;
- if (! file.endsWith('/'))
- file.append('/');
- file.append(tr("New Folder"));
- if (QFileInfo::exists(file))
- for (unsigned i = 1; ; ++i)
- {
- //: The argument is a number, which will be increased if a
- //: folder with the same name already exists
- file = localFolder + '/' + tr("New Folder %1").arg(i);
- if (! QFileInfo::exists(file))
- break;
- }
- return QUrl::fromLocalFile(file).fileName();
-}
-
void GameModel::truncate()
{
if (! m_game.get_current().has_parent())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pentobi-23.0/pentobi/GameModel.h
new/pentobi-23.1/pentobi/GameModel.h
--- old/pentobi-23.0/pentobi/GameModel.h 2023-03-06 11:07:01.000000000
+0100
+++ new/pentobi-23.1/pentobi/GameModel.h 2023-03-12 09:08:40.000000000
+0100
@@ -232,8 +232,6 @@
Q_INVOKABLE QString suggestGameFileName(const QUrl& folder);
- Q_INVOKABLE static QString suggestNewFolderName(const QUrl& folder);
-
Q_INVOKABLE QString getError() const { return m_error; }
Q_INVOKABLE QVariantList getPieceModels(int color);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pentobi-23.0/pentobi/android/AndroidManifest.xml
new/pentobi-23.1/pentobi/android/AndroidManifest.xml
--- old/pentobi-23.0/pentobi/android/AndroidManifest.xml 2023-03-06
11:07:01.000000000 +0100
+++ new/pentobi-23.1/pentobi/android/AndroidManifest.xml 2023-03-12
09:08:40.000000000 +0100
@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android";
package="net.sf.pentobi"
android:installLocation="auto"
- android:versionCode="23000000"
- android:versionName="23.0" >
+ android:versionCode="23001000"
+ android:versionName="23.1" >
<supports-screens
android:anyDensity="true"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pentobi-23.0/pentobi/android/build.gradle
new/pentobi-23.1/pentobi/android/build.gradle
--- old/pentobi-23.0/pentobi/android/build.gradle 2023-03-06
11:07:01.000000000 +0100
+++ new/pentobi-23.1/pentobi/android/build.gradle 1970-01-01
01:00:00.000000000 +0100
@@ -1,81 +0,0 @@
-buildscript {
- repositories {
- google()
- mavenCentral()
- }
-
- dependencies {
- classpath 'com.android.tools.build:gradle:7.2.1'
- }
-}
-
-repositories {
- google()
- mavenCentral()
-}
-
-apply plugin: 'com.android.application'
-
-dependencies {
- implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
-}
-
-android {
- /*******************************************************
- * The following variables:
- * - androidBuildToolsVersion,
- * - androidCompileSdkVersion
- * - qtAndroidDir - holds the path to qt android files
- * needed to build any Qt application
- * on Android.
- *
- * are defined in gradle.properties file. This file is
- * updated by QtCreator and androiddeployqt tools.
- * Changing them manually might break the compilation!
- *******************************************************/
-
- compileSdkVersion androidCompileSdkVersion.toInteger()
- buildToolsVersion androidBuildToolsVersion
- ndkVersion androidNdkVersion
-
- // Extract native libraries from the APK
- packagingOptions.jniLibs.useLegacyPackaging true
-
- sourceSets {
- main {
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = [qtAndroidDir + '/src', 'src', 'java']
- aidl.srcDirs = [qtAndroidDir + '/src', 'src', 'aidl']
- res.srcDirs = [qtAndroidDir + '/res', 'res']
- resources.srcDirs = ['resources']
- renderscript.srcDirs = ['src']
- assets.srcDirs = ['assets']
- jniLibs.srcDirs = ['libs']
- }
- }
-
- tasks.withType(JavaCompile) {
- options.incremental = true
- }
-
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
-
- lintOptions {
- abortOnError false
- }
-
- // Do not compress Qt binary resources file
- aaptOptions {
- noCompress 'rcc'
- }
-
- defaultConfig {
- resConfig "en"
- minSdkVersion qtMinSdkVersion
- targetSdkVersion = 31
- ndk.abiFilters = qtTargetAbiList.split(",")
- }
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/pentobi-23.0/pentobi/unix/io.sourceforge.pentobi.appdata.xml.in
new/pentobi-23.1/pentobi/unix/io.sourceforge.pentobi.appdata.xml.in
--- old/pentobi-23.0/pentobi/unix/io.sourceforge.pentobi.appdata.xml.in
2023-03-06 11:07:01.000000000 +0100
+++ new/pentobi-23.1/pentobi/unix/io.sourceforge.pentobi.appdata.xml.in
2023-03-12 09:08:40.000000000 +0100
@@ -59,6 +59,8 @@
<url type="bugtracker">https://github.com/enz/pentobi/issues</url>
<url type="donation">https://sourceforge.net/p/pentobi/donate/</url>
<url
type="translate">https://www.transifex.com/markus-enzenberger/pentobi/</url>
+<url type="vcs-browser">https://github.com/enz/pentobi</url>
+<url
type="contribute">https://github.com/enz/pentobi/blob/master/CONTRIBUTING.md</url>
<developer_name>Markus Enzenberger</developer_name>
<update_contact>e...@users.sourceforge.net</update_contact>
<provides>
