Hello community,
here is the log from the commit of package stardict-tools for openSUSE:Factory
checked in at 2017-12-19 10:58:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/stardict-tools (Old)
and /work/SRC/openSUSE:Factory/.stardict-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "stardict-tools"
Tue Dec 19 10:58:54 2017 rev:22 rq:558086 version:3.0.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/stardict-tools/stardict-tools.changes
2016-07-05 09:51:32.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.stardict-tools.new/stardict-tools.changes
2017-12-19 10:58:56.048056656 +0100
@@ -1,0 +2,7 @@
+Sun Dec 10 04:46:08 UTC 2017 - i...@marguerite.su
+
+- add patch: stardict-tools-3.0.1-wikipediaImage.patch
+ * fix boo#1067895
+ * fix MYSQL_PORT undefined
+
+-------------------------------------------------------------------
New:
----
stardict-tools-3.0.1-wikipediaImage.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ stardict-tools.spec ++++++
--- /var/tmp/diff_new_pack.VtglKF/_old 2017-12-19 10:58:56.820019391 +0100
+++ /var/tmp/diff_new_pack.VtglKF/_new 2017-12-19 10:58:56.824019198 +0100
@@ -1,7 +1,7 @@
#
# spec file for package stardict-tools
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -31,18 +31,18 @@
Patch2: stardict-tools-3.0.1-destbufferoverflow.patch
Patch3: stardict-tools-3.0.1-gcc44.patch
Patch4: stardict-tools-3.0.1-gcc6.patch
+Patch5: stardict-tools-3.0.1-wikipediaImage.patch
BuildRequires: dos2unix
BuildRequires: gcc-c++
BuildRequires: gtk2-devel >= 2.6.0
BuildRequires: pcre-devel
BuildRequires: update-desktop-files
Recommends: dictd
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} < 1010
BuildRequires: pkgconfig
%else
BuildRequires: libtool
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
%endif
%if 0%{?suse_version} > 1020
BuildRequires: libmysqlclient-devel
@@ -60,6 +60,7 @@
%patch2
%patch3
%patch4 -p1
+%patch5 -p1
%build
autoreconf -fiv
++++++ stardict-tools-3.0.1-wikipediaImage.patch ++++++
Index: stardict-tools-3.0.1/src/wikipediaImage.cpp
===================================================================
--- stardict-tools-3.0.1.orig/src/wikipediaImage.cpp
+++ stardict-tools-3.0.1/src/wikipediaImage.cpp
@@ -6,6 +6,7 @@
#define CONN_HOST "localhost"
#define CONN_USER "wikiuser"
#define CONN_PASS "123"
+#define CONN_PORT 3306
#define CONN_DB "wikidb"
@@ -14,7 +15,7 @@ void dump_file()
MYSQL mysql;
if (!mysql_init(&mysql))
return;
- if (!mysql_real_connect(&mysql, CONN_HOST , CONN_USER , CONN_PASS, NULL
, MYSQL_PORT, NULL, 0))
+ if (!mysql_real_connect(&mysql, CONN_HOST , CONN_USER , CONN_PASS, NULL
, CONN_PORT, NULL, 0))
return;
if (mysql_select_db(&mysql, CONN_DB))
return;
