Hello community, here is the log from the commit of package q4wine for openSUSE:Factory checked in at 2013-12-30 10:38:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/q4wine (Old) and /work/SRC/openSUSE:Factory/.q4wine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "q4wine" Changes: -------- --- /work/SRC/openSUSE:Factory/q4wine/q4wine.changes 2013-12-08 19:49:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.q4wine.new/q4wine.changes 2013-12-30 10:38:14.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Dec 20 18:52:49 UTC 2013 - lazy.k...@opensuse.org + +- Update to 1.1+r2. + * Fixed error while loading application settings by key: + 'WineLibs'. + +------------------------------------------------------------------- Old: ---- q4wine-1.1-r1.tar.bz2 New: ---- q4wine-1.1-r2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ q4wine.spec ++++++ --- /var/tmp/diff_new_pack.Fc0uls/_old 2013-12-30 10:38:15.000000000 +0100 +++ /var/tmp/diff_new_pack.Fc0uls/_new 2013-12-30 10:38:15.000000000 +0100 @@ -17,13 +17,13 @@ Name: q4wine -Version: 1.1+r1 +Version: 1.1+r2 Release: 0 Summary: Qt4 GUI for WINE License: GPL-3.0 Group: System/Emulators/PC Url: http://q4wine.brezblock.org.ua/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-1.1-r1.tar.bz2 +Source0: http://downloads.sourceforge.net/%{name}/%{name}-1.1-r2.tar.bz2 BuildRequires: cmake BuildRequires: fdupes BuildRequires: fuseiso @@ -65,7 +65,7 @@ %lang_package %prep -%setup -qn %{name}-1.1-r1 +%setup -qn %{name}-1.1-r2 %build mkdir build ++++++ q4wine-1.1-r1.tar.bz2 -> q4wine-1.1-r2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.1-r1/AUTHORS new/q4wine-1.1-r2/AUTHORS --- old/q4wine-1.1-r1/AUTHORS 2013-12-01 12:52:44.000000000 +0100 +++ new/q4wine-1.1-r2/AUTHORS 2013-12-16 22:02:58.000000000 +0100 @@ -159,6 +159,10 @@ web: http://hwoarang.silverarrow.gr Greece +Rusmir Dusko +FreeBSD port maintainer +mail: nemy...@freebsd.org + Sergey V. Dyatko FreeBSD port maintainer mail: sergey.dya...@gmail.com diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.1-r1/CMakeLists.txt.user new/q4wine-1.1-r2/CMakeLists.txt.user --- old/q4wine-1.1-r1/CMakeLists.txt.user 2013-12-01 12:52:44.000000000 +0100 +++ new/q4wine-1.1-r2/CMakeLists.txt.user 2013-12-16 22:02:58.000000000 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE QtCreatorProject> -<!-- Written by QtCreator 2.8.1, 2013-12-01T13:47:45. --> +<!-- Written by QtCreator 2.8.1, 2013-12-14T21:54:12. --> <qtcreator> <data> <variable>ProjectExplorer.Project.ActiveTarget</variable> @@ -56,7 +56,7 @@ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{e24b3962-86b6-4474-9c55-f60af033bfa6}</value> <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value> <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> + <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">1</value> <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0"> <value type="QString" key="CMakeProjectManager.CMakeBuildConfiguration.BuildDirectory">/home/brezerk/develop/q4wine-build</value> <value type="bool" key="CMakeProjectManager.CMakeBuildConfiguration.UseNinja">false</value> @@ -200,14 +200,14 @@ <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value> <value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value> <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value> - <value type="int" key="PE.EnvironmentAspect.Base">-1</value> + <value type="int" key="PE.EnvironmentAspect.Base">2</value> <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">q4wine</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.q4wine</value> <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> - <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> - <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> + <value type="bool" key="RunConfiguration.UseCppDebugger">true</value> + <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">false</value> <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value> <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> @@ -248,7 +248,7 @@ <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value> <value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value> <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value> - <value type="int" key="PE.EnvironmentAspect.Base">-1</value> + <value type="int" key="PE.EnvironmentAspect.Base">2</value> <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">q4wine-helper</value> <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.1-r1/ChangeLog new/q4wine-1.1-r2/ChangeLog --- old/q4wine-1.1-r1/ChangeLog 2013-12-01 12:52:44.000000000 +0100 +++ new/q4wine-1.1-r2/ChangeLog 2013-12-16 22:02:58.000000000 +0100 @@ -1,3 +1,7 @@ +Version 1.1-r2 + Fixed: + - Error while loading application settings by key: 'WineLibs' [BUG-42]; + Version 1.1-r1 Fixed: - Error while loading application settings by key: 'WineLibs' [BUG-42]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.1-r1/config.h new/q4wine-1.1-r2/config.h --- old/q4wine-1.1-r1/config.h 2013-12-01 12:52:44.000000000 +0100 +++ new/q4wine-1.1-r2/config.h 2013-12-16 22:02:58.000000000 +0100 @@ -70,8 +70,8 @@ /* #undef WITH_SYSTEM_SINGLEAPP */ #define WITH_WINEAPPDB -#define DEBUG -/* #undef RELEASE */ +/* #undef DEBUG */ +#define RELEASE #define WITH_DBUS @@ -102,8 +102,7 @@ #define APP_ARCH "x86_64" #define APP_HOST "Linux" #define APP_VERS "1.1-r1" -#define APP_PREF "/usr" +#define APP_PREF "/usr/local" #define _CORELIB_PATH_ "libq4wine-core" #endif -#define APP_BUILD "/home/brezerk/develop/q4wine-build/src" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.1-r1/src/CMakeLists.txt new/q4wine-1.1-r2/src/CMakeLists.txt --- old/q4wine-1.1-r1/src/CMakeLists.txt 2013-12-01 12:52:43.000000000 +0100 +++ new/q4wine-1.1-r2/src/CMakeLists.txt 2013-12-16 22:02:55.000000000 +0100 @@ -4,7 +4,7 @@ SET(CMAKE_VERBOSE_MAKEFILE ON) -SET(APP_VERSION "1.1-r1") +SET(APP_VERSION "1.1-r2") SET(APP_NAME_GLOBAL "q4wine") if(POLICY CMP0011) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.1-r1/src/q4wine-gui/authors.h new/q4wine-1.1-r2/src/q4wine-gui/authors.h --- old/q4wine-1.1-r1/src/q4wine-gui/authors.h 2013-12-01 12:52:43.000000000 +0100 +++ new/q4wine-1.1-r2/src/q4wine-gui/authors.h 2013-12-16 22:02:55.000000000 +0100 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2013 by Alexey S. Malakhov <brez...@gmail.com> * +* Copyright (C) 2008-2013 by Alexey S. Malakhov <brez...@gmail.com> * * * * This program is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -456,6 +456,18 @@ "</p>" \ "<p style='margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>" \ " " \ + "</p>" \ + "<p style='margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>" \ + "Rusmir Dusko " \ + "</p>" \ + "<p style='margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>" \ + "FreeBSD port maintainer" \ + "</p>" \ + "<p style='margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>" \ + "<span style='color:#6495ed;'>E-Mail</span>: <a href='mailto:nemy...@freebsd.org' style='text-decoration: none; color:#5f9ea0;'>nemy...@freebsd.org</a>" \ + "</p>" \ + "<p style='margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>" \ + " " \ "</p>" \ "<p style='margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;'>" \ "Sergey V. Dyatko " \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.1-r1/src/q4wine-gui/authors.yaml new/q4wine-1.1-r2/src/q4wine-gui/authors.yaml --- old/q4wine-1.1-r1/src/q4wine-gui/authors.yaml 2013-12-01 12:52:43.000000000 +0100 +++ new/q4wine-1.1-r2/src/q4wine-gui/authors.yaml 2013-12-16 22:02:55.000000000 +0100 @@ -106,6 +106,10 @@ web: http://hwoarang.silverarrow.gr location: Greece + - name: Rusmir Dusko + info: FreeBSD port maintainer + mail: nemy...@freebsd.org + - name: Sergey V. Dyatko info: FreeBSD port maintainer mail: sergey.dya...@gmail.com diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.1-r1/src/q4wine-gui/iconsettings.cpp new/q4wine-1.1-r2/src/q4wine-gui/iconsettings.cpp --- old/q4wine-1.1-r1/src/q4wine-gui/iconsettings.cpp 2013-12-01 12:52:43.000000000 +0100 +++ new/q4wine-1.1-r2/src/q4wine-gui/iconsettings.cpp 2013-12-16 22:02:55.000000000 +0100 @@ -46,9 +46,11 @@ CoreLib.reset((corelib *)CoreLibClassPointer(true)); this->prefix_name = prefix_name; + QHash<QString,QString> result = db_prefix.getByName(this->prefix_name); + this->dir_name = dir_name; this->icon_name = icon_name; - this->prefix_path = db_prefix.getByName(this->prefix_name).value("path"); + this->prefix_path = result.value("path"); if (this->prefix_path.isEmpty()){ this->prefix_path = QDir::homePath(); this->prefix_path.append("/.wine/drive_c/"); @@ -64,7 +66,7 @@ if (QDir(this->prefix_path).exists()) prefix_urls << QUrl::fromLocalFile(this->prefix_path); - QString cd_mount = db_prefix.getMountPoint(this->prefix_name); + QString cd_mount = result.value("mount"); if (!cd_mount.isEmpty()) if (QDir().exists(cd_mount)) @@ -108,7 +110,30 @@ twDlls->installEventFilter(this); - cboxDlls->addItems(CoreLib->getWineDlls(db_prefix.getByName(prefix_name).value("libs"))); + QString libs_path = result.value("libs"); + + if (libs_path.isEmpty()){ + Version vers; + vers.id_ = result.value("version_id"); + if (vers.load()){ + if (result.value("arch") == "win32"){ + libs_path = vers.wine_dllpath32_; + } else if (result.value("arch") == "win64"){ + libs_path = vers.wine_dllpath64_; + } else { + if (vers.wine_dllpath64_.isEmpty()){ + libs_path = vers.wine_dllpath32_; + } else { + libs_path = vers.wine_dllpath64_; + } + } + } + } + + + + cboxDlls->addItems(CoreLib->getWineDlls(libs_path)); + cboxDlls->setMaxVisibleItems (10); cmdOk->setFocus(Qt::ActiveWindowFocusReason); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/q4wine-1.1-r1/src/q4wine-gui/iconsettings.h new/q4wine-1.1-r2/src/q4wine-gui/iconsettings.h --- old/q4wine-1.1-r1/src/q4wine-gui/iconsettings.h 2013-12-01 12:52:43.000000000 +0100 +++ new/q4wine-1.1-r2/src/q4wine-gui/iconsettings.h 2013-12-16 22:02:55.000000000 +0100 @@ -33,6 +33,7 @@ //Db #include "prefix.h" #include "icon.h" +#include "src/core/database/versions.h" //Qt inc -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
