openSUSE Commits
Threads by month
- ----- 2025 -----
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
February 2014
- 1 participants
- 1581 discussions
Hello community,
here is the log from the commit of package mdds for openSUSE:Factory checked in at 2014-02-28 07:24:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mdds (Old)
and /work/SRC/openSUSE:Factory/.mdds.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mdds"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mdds/mdds.changes 2014-01-30 11:33:53.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mdds.new/mdds.changes 2014-02-28 07:24:26.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Feb 25 19:50:47 UTC 2014 - tchvatal(a)suse.com
+
+- Version bump to 0.10.2:
+ * Various bugfixes among 0.10 series found during lo 4.2.1 phase.
+
+-------------------------------------------------------------------
Old:
----
mdds_0.10.1.tar.bz2
New:
----
mdds_0.10.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mdds.spec ++++++
--- /var/tmp/diff_new_pack.Nn7HGe/_old 2014-02-28 07:24:26.000000000 +0100
+++ /var/tmp/diff_new_pack.Nn7HGe/_new 2014-02-28 07:24:26.000000000 +0100
@@ -17,7 +17,7 @@
Name: mdds
-Version: 0.10.1
+Version: 0.10.2
Release: 0
Summary: A collection of multi-dimensional data structure and indexing algorithm
License: MIT
++++++ mdds_0.10.1.tar.bz2 -> mdds_0.10.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mdds_0.10.1/Makefile.in new/mdds_0.10.2/Makefile.in
--- old/mdds_0.10.1/Makefile.in 2014-01-08 16:43:37.000000000 +0100
+++ new/mdds_0.10.2/Makefile.in 2014-02-12 15:34:42.000000000 +0100
@@ -42,7 +42,16 @@
@top_srcdir@/$(INCDIR)/mdds/quad_node.hpp \
@top_srcdir@/$(INCDIR)/mdds/rectangle_set_def.inl \
@top_srcdir@/$(INCDIR)/mdds/rectangle_set.hpp \
- @top_srcdir@/$(INCDIR)/mdds/segment_tree.hpp
+ @top_srcdir@/$(INCDIR)/mdds/segment_tree.hpp \
+ @top_srcdir@/$(INCDIR)/mdds/multi_type_vector.hpp \
+ @top_srcdir@/$(INCDIR)/mdds/multi_type_vector_custom_func1.hpp \
+ @top_srcdir@/$(INCDIR)/mdds/multi_type_vector_custom_func2.hpp \
+ @top_srcdir@/$(INCDIR)/mdds/multi_type_vector_custom_func3.hpp \
+ @top_srcdir@/$(INCDIR)/mdds/multi_type_vector_itr.hpp \
+ @top_srcdir@/$(INCDIR)/mdds/multi_type_vector_trait.hpp \
+ @top_srcdir@/$(INCDIR)/mdds/multi_type_vector_types.hpp \
+ @top_srcdir@/$(INCDIR)/mdds/multi_type_vector_macro.hpp \
+ @top_srcdir@/$(INCDIR)/mdds/multi_type_vector_def.inl
DEPENDS= \
$(HEADERS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mdds_0.10.1/NEWS new/mdds_0.10.2/NEWS
--- old/mdds_0.10.1/NEWS 2014-01-08 16:43:37.000000000 +0100
+++ new/mdds_0.10.2/NEWS 2014-02-12 15:34:42.000000000 +0100
@@ -1,3 +1,14 @@
+mdds 0.10.2
+
+* multi_type_vector
+
+ * fixed a bug in transfer() that would trigger an assertion and
+ eventually lead to a crash. The problem occurred when a range of
+ data to be transferred spanned over 2 blocks and consisted of the
+ lower part of an upper block and the upper part of a lower block.
+
+mdds 0.10.1
+
* multi_type_matrix
* added a variant of set_empty() that takes an additional length
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mdds_0.10.1/configure new/mdds_0.10.2/configure
--- old/mdds_0.10.1/configure 2014-01-08 16:43:37.000000000 +0100
+++ new/mdds_0.10.2/configure 2014-02-12 15:34:42.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mdds 0.10.1.
+# Generated by GNU Autoconf 2.69 for mdds 0.10.2.
#
# Report bugs to <kohei.yoshida(a)gmail.com>.
#
@@ -579,8 +579,8 @@
# Identity of this package.
PACKAGE_NAME='mdds'
PACKAGE_TARNAME='mdds'
-PACKAGE_VERSION='0.10.1'
-PACKAGE_STRING='mdds 0.10.1'
+PACKAGE_VERSION='0.10.2'
+PACKAGE_STRING='mdds 0.10.2'
PACKAGE_BUGREPORT='kohei.yoshida(a)gmail.com'
PACKAGE_URL=''
@@ -1181,7 +1181,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mdds 0.10.1 to adapt to many kinds of systems.
+\`configure' configures mdds 0.10.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1242,7 +1242,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mdds 0.10.1:";;
+ short | recursive ) echo "Configuration of mdds 0.10.2:";;
esac
cat <<\_ACEOF
@@ -1335,7 +1335,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mdds configure 0.10.1
+mdds configure 0.10.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1352,7 +1352,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mdds $as_me 0.10.1, which was
+It was created by mdds $as_me 0.10.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -1701,7 +1701,7 @@
-VERSION=0.10.1
+VERSION=0.10.2
PACKAGE_TARNAME=mdds
@@ -2298,7 +2298,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mdds $as_me 0.10.1, which was
+This file was extended by mdds $as_me 0.10.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2351,7 +2351,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mdds config.status 0.10.1
+mdds config.status 0.10.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -3455,7 +3455,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mdds $as_me 0.10.1, which was
+This file was extended by mdds $as_me 0.10.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3508,7 +3508,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mdds config.status 0.10.1
+mdds config.status 0.10.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -4613,7 +4613,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mdds $as_me 0.10.1, which was
+This file was extended by mdds $as_me 0.10.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4666,7 +4666,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mdds config.status 0.10.1
+mdds config.status 0.10.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -5772,7 +5772,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mdds $as_me 0.10.1, which was
+This file was extended by mdds $as_me 0.10.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5825,7 +5825,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mdds config.status 0.10.1
+mdds config.status 0.10.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mdds_0.10.1/configure.ac new/mdds_0.10.2/configure.ac
--- old/mdds_0.10.1/configure.ac 2014-01-08 16:43:37.000000000 +0100
+++ new/mdds_0.10.2/configure.ac 2014-02-12 15:34:42.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT(mdds, 0.10.1, kohei.yoshida(a)gmail.com)
+AC_INIT(mdds, 0.10.2, kohei.yoshida(a)gmail.com)
VERSION=AC_PACKAGE_VERSION
AC_SUBST(VERSION)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mdds_0.10.1/include/mdds/multi_type_vector_def.inl new/mdds_0.10.2/include/mdds/multi_type_vector_def.inl
--- old/mdds_0.10.1/include/mdds/multi_type_vector_def.inl 2014-01-08 16:43:37.000000000 +0100
+++ new/mdds_0.10.2/include/mdds/multi_type_vector_def.inl 2014-02-12 15:34:42.000000000 +0100
@@ -1556,9 +1556,10 @@
else
{
// Copy to the middle of destination block. Insert slots for new
- // blocks (plus one for the empty block) below current.
+ // blocks (plus one for the bottom empty block) below current.
size_type blk2_size = blk_dest->m_size - dest_pos_in_block - len;
dest.m_blocks.insert(dest.m_blocks.begin()+dest_block_index+1, block_len+1, NULL);
+ assert(dest.m_blocks.size() > dest_block_index+block_len+1);
dest.m_blocks[dest_block_index+block_len+1] = new block(blk2_size);
blk_dest->m_size = dest_pos_in_block;
@@ -1657,7 +1658,39 @@
dest.merge_with_adjacent_blocks(dest_block_index1);
// Delete all transferred blocks, and replace it with one empty block.
- assert(del_index2 >= del_index1);
+ if (del_index2 < del_index1)
+ {
+ // No blocks will be deleted. See if we can just extend one of the
+ // neighboring empty blocks.
+
+ block* blk1 = m_blocks[block_index1];
+ block* blk2 = m_blocks[block_index2];
+
+ if (!blk1->mp_data)
+ {
+ assert(blk2->mp_data);
+
+ // Block 1 is empty. Extend this block.
+ blk1->m_size += len;
+ return get_iterator(block_index1, start_pos_in_block1);
+ }
+
+ if (!blk2->mp_data)
+ {
+ assert(blk1->mp_data);
+
+ // Block 2 is empty. Extend this block.
+ blk2->m_size += len;
+ return get_iterator(block_index2, start_pos);
+ }
+
+ // Neither block1 nor block2 are empty. Just insert a new empty block
+ // between them. After the insertion, the old block2 position becomes
+ // the position of the inserted block.
+ m_blocks.insert(m_blocks.begin()+block_index2, new block(len));
+ return get_iterator(block_index2, start_pos);
+ }
+
if (del_index1 > 0 && !m_blocks[del_index1-1]->mp_data)
{
// The block before the first block to be deleted is empty. Simply
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mdds_0.10.1/src/multi_type_vector_test_default.cpp new/mdds_0.10.2/src/multi_type_vector_test_default.cpp
--- old/mdds_0.10.1/src/multi_type_vector_test_default.cpp 2014-01-08 16:43:37.000000000 +0100
+++ new/mdds_0.10.2/src/multi_type_vector_test_default.cpp 2014-02-12 15:34:42.000000000 +0100
@@ -4791,6 +4791,95 @@
assert(mtv::uchar_element_block::block_type == mtv::element_type_uchar);
}
+void mtv_test_transfer()
+{
+ stack_printer __stack_printer__("::mtv_test_transfer");
+ mtv_type db1(5), db2(5);
+ db1.set(0, 1.0);
+ db1.set(1, 2.0);
+ mtv_type::iterator it = db1.transfer(1, 2, db2, 1);
+
+ assert(db1.get<double>(0) == 1.0);
+ assert(db1.is_empty(1));
+ assert(db1.is_empty(2));
+ assert(db1.is_empty(3));
+ assert(db1.is_empty(4));
+
+ assert(db2.is_empty(0));
+ assert(db2.get<double>(1) == 2.0);
+ assert(db2.is_empty(2));
+ assert(db2.is_empty(3));
+ assert(db2.is_empty(4));
+
+ assert(it->size == 4);
+ assert(it->__private_data.block_index == 1);
+ assert(it->position == 1);
+
+ // Reset and start over.
+ db1.clear();
+ db1.resize(5);
+ db2.clear();
+ db2.resize(5);
+
+ db1.set(2, 1.2);
+ db1.set(3, 1.3);
+
+ // Transfer 1:2 in db1 to 2:3 in db2.
+ it = db1.transfer(1, 2, db2, 2);
+
+ assert(db1.is_empty(0));
+ assert(db1.is_empty(1));
+ assert(db1.is_empty(2));
+ assert(db1.get<double>(3) == 1.3);
+ assert(db1.is_empty(4));
+
+ assert(db2.is_empty(0));
+ assert(db2.is_empty(1));
+ assert(db2.is_empty(2));
+ assert(db2.get<double>(3) == 1.2);
+ assert(db2.is_empty(4));
+
+ assert(it->size == 3);
+ assert(it->position == 0);
+ assert(it->__private_data.block_index == 0);
+
+ // Reset and start over.
+ db1.clear();
+ db1.resize(4);
+ db2.clear();
+ db2.resize(4);
+
+ db1.set(0, string("A"));
+ db1.set(1, string("B"));
+ db1.set(2, 11.1);
+ db1.set(3, 11.2);
+
+ it = db1.transfer(1, 2, db2, 1);
+
+ assert(db1.get<string>(0) == "A");
+ assert(db1.is_empty(1));
+ assert(db1.is_empty(2));
+ assert(db1.get<double>(3) == 11.2);
+
+ assert(db2.is_empty(0));
+ assert(db2.get<string>(1) == "B");
+ assert(db2.get<double>(2) == 11.1);
+ assert(db2.is_empty(3));
+
+ assert(it->size == 2);
+ assert(it->position == 1);
+ assert(it->__private_data.block_index == 1);
+
+ // Reset and start over.
+ db1.clear();
+ db1.resize(4);
+ db2.clear();
+ db2.resize(4);
+
+ db1.set(2, 12.8);
+ it = db1.transfer(1, 2, db2, 1);
+}
+
}
int main (int argc, char **argv)
@@ -4826,6 +4915,7 @@
mtv_test_swap_range();
mtv_test_value_type();
mtv_test_block_identifier();
+ mtv_test_transfer();
cout << "Test finished successfully!" << endl;
return EXIT_SUCCESS;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package man-pages for openSUSE:Factory checked in at 2014-02-28 07:24:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/man-pages (Old)
and /work/SRC/openSUSE:Factory/.man-pages.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "man-pages"
Changes:
--------
--- /work/SRC/openSUSE:Factory/man-pages/man-pages.changes 2014-02-19 09:10:26.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.man-pages.new/man-pages.changes 2014-02-28 07:24:18.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Feb 27 07:20:42 UTC 2014 - pgajdos(a)suse.com
+
+- update to version 3.61:
+ * added notes on thread-safety to various manual pages
+ * see Changes for details
+
+-------------------------------------------------------------------
Old:
----
man-pages-3.60.tar.xz
New:
----
man-pages-3.61.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ man-pages.spec ++++++
--- /var/tmp/diff_new_pack.uhsxkm/_old 2014-02-28 07:24:19.000000000 +0100
+++ /var/tmp/diff_new_pack.uhsxkm/_new 2014-02-28 07:24:19.000000000 +0100
@@ -18,7 +18,7 @@
Name: man-pages
Url: http://www.kernel.org/doc/man-pages/download.html
-Version: 3.60
+Version: 3.61
Release: 0
Summary: Linux Manual Pages
License: BSD-3-Clause and GPL-2.0+ and MIT
++++++ man-pages-3.60.tar.xz -> man-pages-3.61.tar.xz ++++++
++++ 18335 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package lightdm for openSUSE:Factory checked in at 2014-02-28 07:23:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lightdm (Old)
and /work/SRC/openSUSE:Factory/.lightdm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightdm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes 2014-02-22 18:11:20.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2014-02-28 07:23:58.000000000 +0100
@@ -1,0 +2,15 @@
+Thu Feb 27 11:11:54 UTC 2014 - gber(a)opensuse.org
+
+- only build-depend on Qt5 for >= 13.1
+
+-------------------------------------------------------------------
+Thu Feb 27 00:09:09 UTC 2014 - gber(a)opensuse.org
+
+- drop support for openSUSE < 12.3
+- do not overwrite lightdm.conf, users.conf, keys.conf by default
+- make use of lightdm.conf.d, put openSUSE-specific configuration
+ in /usr/share/lightdm/lightdm.conf.d and drop
+ lightdm-default-configuration.patch
+- remove useless usermod call
+
+-------------------------------------------------------------------
Old:
----
lightdm-default-configuration.patch
New:
----
50-suse-defaults.conf
users.conf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lightdm.spec ++++++
--- /var/tmp/diff_new_pack.I6wd3h/_old 2014-02-28 07:23:59.000000000 +0100
+++ /var/tmp/diff_new_pack.I6wd3h/_new 2014-02-28 07:23:59.000000000 +0100
@@ -23,11 +23,7 @@
%define qt_lib lib%{qt_libname}-0
%define qt5_libname lightdm-qt5-3
%define qt5_lib lib%{qt5_libname}-0
-%if 0%{?suse_version} >= 1230
%define rundir /run
-%else
-%define rundir %{_localstatedir}/run
-%endif
Name: lightdm
Version: 1.8.7
@@ -40,6 +36,8 @@
Source1: %{name}-greeter.pamd
Source2: X11-displaymanagers-%{name}
Source3: dm-tool.1
+Source4: 50-suse-defaults.conf
+Source5: users.conf
Source100: %{name}-rpmlintrc
# PATCH-FEATURE-OPENSUSE lightdm-sysconfig-support.patch gber(a)opensuse.org -- Adds support for reading configuration options from /etc/sysconfig/displaymanager and /etc/sysconfig/windowmanager
Patch0: lightdm-sysconfig-support.patch
@@ -47,8 +45,6 @@
Patch1: lightdm-xauthlocalhostname-support.patch
# PATCH-FEATURE-OPENSUSE lightdm-set-gdmflexiserver-envvar.patch gber(a)opensuse.org -- Sets the GDMFLEXISERVER environment variable for the gdmflexiserver wrapper
Patch2: lightdm-set-gdmflexiserver-envvar.patch
-# PATCH-FEATURE-OPENSUSE lightdm-default-configuration.patch gber(a)opensuse.org -- Modifies configuration with suitable defaults for openSUSE
-Patch3: lightdm-default-configuration.patch
# PATCH-FIX-UPSTREAM lightdm-lock-screen-before-switch.patch gber(a)opensuse.org -- Try to lock the screen before switching users
Patch4: lightdm-lock-screen-before-switch.patch
# PATCH-FIX-OPENSUSE lightdm-disable-utmp-handling.patch gber(a)opensuse.org -- Disable utmp handling since this is handled in the Xstartup/Xreset scripts
@@ -71,9 +67,11 @@
BuildRequires: pkgconfig(QtCore)
BuildRequires: pkgconfig(QtDBus)
BuildRequires: pkgconfig(QtGui)
+%if 0%{?suse_version} >= 1310
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Gui)
+%endif
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xdmcp)
@@ -158,12 +156,9 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%patch4 -p1
%patch5 -p1
-%if 0%{?suse_version} >= 1230
%patch6 -p1
-%endif
%build
%if 0%{?suse_version} >= 1310
@@ -196,30 +191,32 @@
ln -sf %{_sysconfdir}/pam.d/xdm %{buildroot}%{_sysconfdir}/pam.d/lightdm
ln -sf %{_sysconfdir}/pam.d/xdm-np %{buildroot}%{_sysconfdir}/pam.d/lightdm-autologin
-install -D -m 644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/lightdm-greeter
-install -D -m 644 -p %{SOURCE2} %{buildroot}%{_libexecdir}/X11/displaymanagers/lightdm
-
-install -D -m 644 -p %{SOURCE3} %{buildroot}%{_mandir}/man1/dm-tool.1
install -d %{buildroot}%{_datadir}/lightdm/greeters
-install -d %{buildroot}%{_datadir}/xgreeters
-install -d %{buildroot}%{_datadir}/lightdm/sessions
+install -d %{buildroot}%{_datadir}/lightdm/lightdm.conf.d
install -d %{buildroot}%{_datadir}/lightdm/remote-sessions
+install -d %{buildroot}%{_datadir}/lightdm/sessions
+install -d %{buildroot}%{_datadir}/xgreeters
+install -d %{buildroot}%{_localstatedir}/cache/lightdm
+install -d %{buildroot}%{_localstatedir}/lib/lightdm
install -d %{buildroot}%{_localstatedir}/log/lightdm
+install -d %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d
install -d %{buildroot}%{rundir}/lightdm
-install -d %{buildroot}%{_localstatedir}/lib/lightdm
-install -d %{buildroot}%{_localstatedir}/cache/lightdm
-%find_lang %{name} %{?no_lang_C}
+install -D -m 644 -p %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/lightdm-greeter
+install -D -m 644 -p %{SOURCE2} %{buildroot}%{_libexecdir}/X11/displaymanagers/lightdm
+
+install -D -m 644 -p %{SOURCE3} %{buildroot}%{_mandir}/man1/dm-tool.1
-%clean
-rm -rf %{buildroot}
+install -D -m 644 -p %{SOURCE4} %{buildroot}%{_datadir}/lightdm/lightdm.conf.d/50-suse-defaults.conf
+install -D -m 644 -p %{SOURCE5} %{buildroot}%{_sysconfdir}/lightdm/users.conf
+
+%find_lang %{name} %{?no_lang_C}
%pre
/usr/sbin/groupadd -r lightdm 2> /dev/null || :
/usr/sbin/useradd -r -g lightdm -s /bin/false -c "LightDM daemon" \
-d /var/lib/lightdm lightdm 2> /dev/null || :
-/usr/sbin/usermod -g lightdm -G lightdm -s /bin/false lightdm 2> /dev/null
%post -n %{gobject_lib} -p /sbin/ldconfig
@@ -244,10 +241,10 @@
%{_libexecdir}/%{name}/lightdm-set-defaults
%{_libexecdir}/%{name}/lightdm-guest-session-wrapper
%{_libexecdir}/%{name}/gdmflexiserver
-%dir %{_sysconfdir}/lightdm/
-%config %{_sysconfdir}/lightdm/lightdm.conf
-%config %{_sysconfdir}/lightdm/users.conf
-%config %{_sysconfdir}/lightdm/keys.conf
+%{_sysconfdir}/lightdm/
+%config(noreplace) %{_sysconfdir}/lightdm/lightdm.conf
+%config(noreplace) %{_sysconfdir}/lightdm/users.conf
+%config(noreplace) %{_sysconfdir}/lightdm/keys.conf
%config %{_sysconfdir}/pam.d/lightdm*
%config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf
%dir %{_libexecdir}/X11/displaymanagers/
++++++ 50-suse-defaults.conf ++++++
[LightDM]
user-authority-in-system-dir=true
[SeatDefaults]
xserver-command=/usr/bin/X
session-wrapper=/etc/X11/xdm/Xsession
greeter-setup-script=/etc/X11/xdm/Xsetup
session-setup-script=/etc/X11/xdm/Xstartup
session-cleanup-script=/etc/X11/xdm/Xreset
++++++ users.conf ++++++
#
# User accounts configuration
#
# NOTE: If you have AccountsService installed on your system, then LightDM will
# use this instead and these settings will be ignored
#
# minimum-uid = Minimum UID required to be shown in greeter
# hidden-users = Users that are not shown to the user
# hidden-shells = Shells that indicate a user cannot login
#
[UserAccounts]
minimum-uid=1000
hidden-users=nobody
hidden-shells=/bin/false /sbin/nologin
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libyui-gtk for openSUSE:Factory checked in at 2014-02-28 07:23:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-gtk (Old)
and /work/SRC/openSUSE:Factory/.libyui-gtk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-gtk"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-gtk/libyui-gtk.changes 2014-02-25 07:33:35.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libyui-gtk.new/libyui-gtk.changes 2014-02-28 07:23:05.000000000 +0100
@@ -1,0 +2,6 @@
+Thu Feb 27 14:57:15 UTC 2014 - mvidner(a)suse.com
+
+- Fixed save_y2logs invocation (bnc#866056).
+- 2.44.2
+
+-------------------------------------------------------------------
Old:
----
libyui-gtk-2.44.1.tar.bz2
New:
----
libyui-gtk-2.44.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-gtk-doc.spec ++++++
--- /var/tmp/diff_new_pack.iMDFQs/_old 2014-02-28 07:23:05.000000000 +0100
+++ /var/tmp/diff_new_pack.iMDFQs/_new 2014-02-28 07:23:05.000000000 +0100
@@ -17,7 +17,7 @@
Name: libyui-gtk-doc
-Version: 2.44.1
+Version: 2.44.2
Release: 0
Source: libyui-gtk-%{version}.tar.bz2
++++++ libyui-gtk.spec ++++++
--- /var/tmp/diff_new_pack.iMDFQs/_old 2014-02-28 07:23:05.000000000 +0100
+++ /var/tmp/diff_new_pack.iMDFQs/_new 2014-02-28 07:23:05.000000000 +0100
@@ -17,7 +17,7 @@
Name: libyui-gtk
-Version: 2.44.1
+Version: 2.44.2
Release: 0
Source: libyui-gtk-%{version}.tar.bz2
++++++ libyui-gtk-2.44.1.tar.bz2 -> libyui-gtk-2.44.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.44.1/ChangeLog new/libyui-gtk-2.44.2/ChangeLog
--- old/libyui-gtk-2.44.1/ChangeLog 2014-02-24 14:55:54.000000000 +0100
+++ new/libyui-gtk-2.44.2/ChangeLog 2014-02-27 16:24:26.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Feb 27 14:57:15 UTC 2014 - mvidner(a)suse.com
+
+- Fixed save_y2logs invocation (bnc#866056).
+- 2.44.2
+
+-------------------------------------------------------------------
Wed Feb 19 20:58:13 CET 2014 - anaselli(a)linux.it
- Added seconds to YTimeField as for Qt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.44.1/VERSION.cmake new/libyui-gtk-2.44.2/VERSION.cmake
--- old/libyui-gtk-2.44.1/VERSION.cmake 2014-02-24 14:55:54.000000000 +0100
+++ new/libyui-gtk-2.44.2/VERSION.cmake 2014-02-27 16:24:26.000000000 +0100
@@ -1,6 +1,6 @@
SET( VERSION_MAJOR "2" )
SET( VERSION_MINOR "44" )
-SET( VERSION_PATCH "1" )
+SET( VERSION_PATCH "2" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SHA1}" )
##### This is need for the libyui core, ONLY.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-gtk-2.44.1/src/YGUI.cc new/libyui-gtk-2.44.2/src/YGUI.cc
--- old/libyui-gtk-2.44.1/src/YGUI.cc 2014-02-21 15:08:01.000000000 +0100
+++ new/libyui-gtk-2.44.2/src/YGUI.cc 2014-02-27 16:24:26.000000000 +0100
@@ -357,10 +357,10 @@
std::string filename = askForFileOrDirectory (GTK_FILE_CHOOSER_ACTION_SAVE,
"/tmp/y2logs.tgz", "*.tgz *.tar.gz", _("Save y2logs"));
if (!filename.empty()) {
- std::string command = "/sbin/save_y2logs";
+ std::string command = "/usr/sbin/save_y2logs";
command += " '" + filename + "'";
- yuiMilestone() << "Saving y2logs: " << command << std::endl;
- int ret = system (command.c_str());
+ yuiMilestone() << "Saving y2logs: " << command << std::endl;
+ int ret = system (command.c_str());
if (ret == 0)
yuiMilestone() << "y2logs saved to " << filename << std::endl;
else {
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qtwebkit for openSUSE:Factory checked in at 2014-02-28 07:21:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebkit (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebkit"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtwebkit/libqt5-qtwebkit.changes 2014-02-18 16:18:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new/libqt5-qtwebkit.changes 2014-02-28 07:21:33.000000000 +0100
@@ -1,0 +2,9 @@
+Wed Feb 26 22:40:56 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Added dont-pollute-prl-and-pc-files.patch from upstream - fixes
+ issue where private dependencies (such as e.g. gstreamer) where
+ marked as public
+- As per patch, remove all external/private Requires of devel
+ subpackages
+
+-------------------------------------------------------------------
New:
----
dont-pollute-prl-and-pc-files.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebkit.spec ++++++
--- /var/tmp/diff_new_pack.nGy3Lb/_old 2014-02-28 07:21:34.000000000 +0100
+++ /var/tmp/diff_new_pack.nGy3Lb/_new 2014-02-28 07:21:34.000000000 +0100
@@ -48,6 +48,8 @@
Patch130: no-Werror-rpath.diff
# PATCH-FIX-UPSTREAM fix build with disabled jit
Patch131: fix-no-jit-build.patch
+# PATCH-FIX-UPSTREAM dont-pollute-prl-and-pc-files.patch -- Don't pollute .prl & .pc files with private dependencies
+Patch132: dont-pollute-prl-and-pc-files.patch
BuildRequires: pkgconfig(Qt5Core) >= %{version}
BuildRequires: pkgconfig(Qt5Network) >= %{version}
BuildRequires: pkgconfig(Qt5OpenGL) >= %{version}
@@ -127,6 +129,7 @@
%patch5 -p1
%patch130 -p1
%patch131
+%patch132 -p1
%package -n %libname
Summary: Qt 5 WebKit Library
@@ -150,7 +153,6 @@
Group: Development/Libraries/X11
Requires: %libname = %{version}
Requires: libQt5WebKit5-devel = %{version}
-Requires: libicu-devel
Requires: libqt5-qtdeclarative-devel >= %{version}
Requires: libqt5-qtsensors-devel >= %{version}
@@ -161,8 +163,6 @@
Summary: Qt Development Kit
Group: Development/Libraries/X11
Requires: libQt5WebKit5 = %version
-Requires: libjpeg-devel
-Requires: libxslt-devel
Requires: pkgconfig(Qt5Core) >= %version
Requires: pkgconfig(Qt5Gui) >= %version
Requires: pkgconfig(Qt5Network) >= %version
@@ -170,31 +170,6 @@
Requires: pkgconfig(Qt5Quick) >= %version
Requires: pkgconfig(Qt5Sensors) >= %version
Requires: pkgconfig(Qt5Sql) >= %version
-Requires: pkgconfig(fontconfig)
-Requires: pkgconfig(gl)
-Requires: pkgconfig(glib-2.0)
-Requires: pkgconfig(libpng)
-Requires: pkgconfig(libwebp)
-Requires: pkgconfig(sqlite3)
-Requires: pkgconfig(x11)
-Requires: pkgconfig(xext)
-Requires: pkgconfig(xrender)
-%if 0%{?suse_version} < 1330
-Requires: pkgconfig(gstreamer-0.10)
-Requires: pkgconfig(gstreamer-app-0.10)
-Requires: pkgconfig(gstreamer-base-0.10)
-Requires: pkgconfig(gstreamer-interfaces-0.10)
-Requires: pkgconfig(gstreamer-pbutils-0.10)
-Requires: pkgconfig(gstreamer-plugins-base-0.10)
-Requires: pkgconfig(gstreamer-video-0.10)
-%else
-Requires: pkgconfig(gstreamer-1.0)
-Requires: pkgconfig(gstreamer-app-1.0)
-Requires: pkgconfig(gstreamer-base-1.0)
-Requires: pkgconfig(gstreamer-pbutils-1.0)
-Requires: pkgconfig(gstreamer-plugins-base-1.0)
-Requires: pkgconfig(gstreamer-video-1.0)
-%endif
%description -n libQt5WebKit5-devel
You need this package, if you want to compile programs with qtwebkit.
++++++ dont-pollute-prl-and-pc-files.patch ++++++
From: Jocelyn Turcotte <jocelyn.turcotte(a)digia.com>
Date: Tue, 28 Jan 2014 12:07:59 +0000
Subject: Don't pollute .prl & .pc files with private dependencies
---
Don't pollute .prl & .pc files with private dependencies
Also change the creating_module check in needToLink to make sure that
only the main module will try to link directly with the WebCore and
JavaScriptCore static libraries.
Task-number: QTBUG-35774
Initial-patch-by: Oswald Buddenhagen <oswald.buddenhagen(a)digia.com>
Change-Id: Ib5992e112803679837249400e98cb8c22636096d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen(a)digia.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen(a)digia.com>
---
--- a/Source/widgetsapi.pri
+++ b/Source/widgetsapi.pri
@@ -49,6 +49,7 @@
WEBKIT += javascriptcore wtf webcore
MODULE = webkitwidgets
+CONFIG += creating_module
# We want the QtWebKit API forwarding includes to live in the root build dir.
MODULE_BASE_DIR = $$_PRO_FILE_PWD_
--- a/Tools/qmake/mkspecs/features/default_post.prf
+++ b/Tools/qmake/mkspecs/features/default_post.prf
@@ -171,8 +171,8 @@
}
defineTest(needToLink) {
- # The main dynamic library always needs to link in the intermediate libraries
- creating_module: return(true)
+ # The main module dynamic library always needs to link in the intermediate libraries
+ isEqual(MODULE, webkit): return(true)
force_static_libs_as_shared {
# So do the individual libraries if they are dynamic
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libevdev for openSUSE:Factory checked in at 2014-02-28 07:21:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libevdev (Old)
and /work/SRC/openSUSE:Factory/.libevdev.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libevdev"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libevdev/libevdev.changes 2014-02-07 10:26:14.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libevdev.new/libevdev.changes 2014-02-28 07:21:11.000000000 +0100
@@ -1,0 +2,9 @@
+Wed Feb 26 22:59:18 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 1.0, for more details, please see:
+ http://lists.freedesktop.org/archives/input-tools/2014-January/000763.html
+ and http://lists.freedesktop.org/archives/input-tools/2014-February/000766.html
+- SO version bumped to 2
+- Explicitly remove la files, instead of excluding them
+
+-------------------------------------------------------------------
Old:
----
libevdev-0.4.tar.xz
New:
----
libevdev-1.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libevdev.spec ++++++
--- /var/tmp/diff_new_pack.RcMVU2/_old 2014-02-28 07:21:12.000000000 +0100
+++ /var/tmp/diff_new_pack.RcMVU2/_new 2014-02-28 07:21:12.000000000 +0100
@@ -18,7 +18,8 @@
Name: libevdev
-Version: 0.4
+%define sonum 2
+Version: 1.0
Release: 0
Summary: A wrapper library for evdev devices
License: MIT
@@ -40,7 +41,7 @@
%package devel
Summary: Development files for libevdev library
Group: Development/Libraries/Other
-Requires: libevdev1 = %{version}
+Requires: libevdev%{sonum} = %{version}
%description devel
Library for handling evdev kernel devices. It abstracts the ioctls
@@ -49,11 +50,11 @@
Development files for libevdev library
-%package -n libevdev1
+%package -n libevdev%{sonum}
Summary: Library for handling evdev kernel devices
Group: System/Libraries
-%description -n libevdev1
+%description -n libevdev%{sonum}
Library for handling evdev kernel devices. It abstracts the ioctls
through type-safe interfaces and provides functions to change
the appearance of the device.
@@ -72,16 +73,16 @@
%install
%make_install
+rm -f "%buildroot/%{_libdir}"/*.la
-%post -n libevdev1 -p /sbin/ldconfig
+%post -n libevdev%{sonum} -p /sbin/ldconfig
-%postun -n libevdev1 -p /sbin/ldconfig
+%postun -n libevdev%{sonum} -p /sbin/ldconfig
-%files -n libevdev1
+%files -n libevdev%{sonum}
%defattr(-,root,root)
%doc COPYING
%{_libdir}/%{name}.so.*
-%exclude %{_libdir}/*.la
%files devel
%defattr(-,root,root)
@@ -90,6 +91,6 @@
%dir %{_includedir}/%{name}-1.0
%{_includedir}/%{name}-1.0/%{name}/
%{_libdir}/pkgconfig/%{name}.pc
-%exclude %{_libdir}/*.la
+%{_mandir}/man3/libevdev.*
%changelog
++++++ libevdev-0.4.tar.xz -> libevdev-1.0.tar.xz ++++++
++++ 41736 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libabw for openSUSE:Factory checked in at 2014-02-28 07:20:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libabw (Old)
and /work/SRC/openSUSE:Factory/.libabw.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libabw"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libabw/libabw.changes 2014-02-11 19:36:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libabw.new/libabw.changes 2014-02-28 07:20:54.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Feb 25 19:52:49 UTC 2014 - tchvatal(a)suse.com
+
+- Version bump to 0.0.2:
+ * various bugfixes
+ * build fixes with various boost versions.
+
+-------------------------------------------------------------------
Old:
----
libabw-0.0.1.tar.xz
New:
----
libabw-0.0.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libabw.spec ++++++
--- /var/tmp/diff_new_pack.3Ybbna/_old 2014-02-28 07:20:54.000000000 +0100
+++ /var/tmp/diff_new_pack.3Ybbna/_new 2014-02-28 07:20:54.000000000 +0100
@@ -18,7 +18,7 @@
%define libname libabw-0_0-0
Name: libabw
-Version: 0.0.1
+Version: 0.0.2
Release: 0
Summary: Library for parsing the Abiword file format structure
License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+
++++++ libabw-0.0.1.tar.xz -> libabw-0.0.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/CREDITS new/libabw-0.0.2/CREDITS
--- old/libabw-0.0.1/CREDITS 2013-11-29 08:08:10.000000000 +0100
+++ new/libabw-0.0.2/CREDITS 2014-02-10 15:41:38.000000000 +0100
@@ -7,3 +7,4 @@
Contributors
------------
+David Tardon <dtardon(a)redhat.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/ChangeLog new/libabw-0.0.2/ChangeLog
--- old/libabw-0.0.1/ChangeLog 2014-01-15 09:42:29.000000000 +0100
+++ new/libabw-0.0.2/ChangeLog 2014-02-10 15:49:47.000000000 +0100
@@ -1,3 +1,64 @@
+2014-02-10 David Tardon <dtardon(a)redhat.com> [47057a7fdce703813f41223d908237a180b75b57]
+
+ prepare for a new release
+
+ Change-Id: I387df9a26538bf37248cb2f8a1a1c083e9628b1d
+
+2014-02-07 David Tardon <dtardon(a)redhat.com> [b4c2bd396d73204a46cf084bc444d254949920ae]
+
+ CID#1165311 missing break
+
+ There is no need to set ret if we are going to return immediately
+ anyway.
+
+ Change-Id: I390a4f67c907d75c554673f976b952e1008c94ae
+ (cherry picked from commit f16e6cf59bdc681d410cd356e4eff89abd98e372)
+
+2014-02-07 David Tardon <dtardon(a)redhat.com> [ed285b772d124ef9a900f9fd9f53a9b72fdb34de]
+
+ add myself to contributors
+
+ Change-Id: I8fea4c66e58690ef808b8ae48bcb1e3186deb07d
+ (cherry picked from commit f3723f79a20de230b3159b8d73debb567bb520f4)
+
+2014-01-23 Fridrich Štrba <fridrich.strba(a)bluewin.ch> [d6fcd4af658079dd6399559a0603b9c356b61197]
+
+ Ignore cells if not inside the <table></table> tags
+
+ Change-Id: I5dfc2d05a6191f9cbf97d300a9ca1624b40e21e9
+ (cherry picked from commit 1b941a8b1e2aa1909c1f6a0d2c8aeeb04f8ec4b2)
+
+2014-01-21 Fridrich Štrba <fridrich.strba(a)bluewin.ch> [1d98978ccd026b4e2372faf3a373682a1a96605b]
+
+ std::string constructor with null string might crash in some cases
+
+ Change-Id: Ie692ffbece7235fe32abf46e84d4f2a29442e96f
+ (cherry picked from commit 393f2b5bb8bbb802526771baf1087725cf920452)
+
+2014-01-17 Fridrich Štrba <fridrich.strba(a)bluewin.ch> [095b595a81cc18f3f16960c202079d2e961d1634]
+
+ Put as much as you can into the try block
+
+ Change-Id: Id9c4193228bc7af7da685edb0db07c91f6c8de24
+
+2014-01-17 Fridrich Štrba <fridrich.strba(a)bluewin.ch> [e68f8f29ec365cc07edf6f1b1dc15c7f75f40051]
+
+ All invocation of xmlReaderForStream use the same options
+
+ Change-Id: I6f61c92db22114e3592cd5d24516bcd879422566
+
+2014-01-16 Fridrich Štrba <fridrich.strba(a)bluewin.ch> [2b21394e42767ece602741538e485c2ec3cb5c85]
+
+ No need to use the stuff from inttypes here
+
+ Change-Id: Ia8087ed0b18c8ed12ec75d272bf8f409038f33b0
+
+2014-01-15 Fridrich Štrba <fridrich.strba(a)bluewin.ch> [54c72c4e27dc26bb74473f2fccaa5dcf9dba01d7]
+
+ Strip first tab in a list text
+
+ Change-Id: I46a4d0f36b2d255a30c669f24dabe65852c35d61
+
2014-01-15 Fridrich Štrba <fridrich.strba(a)bluewin.ch> [b0a20439bd67fae0fb1aeb71909e7c48f4ab6979]
Bump version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/NEWS new/libabw-0.0.2/NEWS
--- old/libabw-0.0.1/NEWS 2014-01-15 09:41:21.000000000 +0100
+++ new/libabw-0.0.2/NEWS 2014-02-10 15:46:47.000000000 +0100
@@ -8,3 +8,8 @@
- Fix silly with paragraphs after foot-/endnote
- Fix conversion of embedded images
- Fix shapes of lists.
+
+0.0.1 -> 0.0.2
+ - Do not add extra tab for list indentation
+ - Avoid possible crash on file format detection
+ - Ignore cells that are not inside a table
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/config.guess new/libabw-0.0.2/config.guess
--- old/libabw-0.0.1/config.guess 2014-01-14 17:01:58.000000000 +0100
+++ new/libabw-0.0.2/config.guess 2014-02-10 15:41:56.000000000 +0100
@@ -1,8 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2013-06-10'
+timestamp='2012-12-29'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -24,7 +26,7 @@
# program. This Exception is an additional permission under section 7
# of the GNU General Public License, version 3 ("GPLv3").
#
-# Originally written by Per Bothner.
+# Originally written by Per Bothner.
#
# You can get the latest version of this script from:
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.gues…
@@ -50,7 +52,9 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -132,37 +136,6 @@
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-case "${UNAME_SYSTEM}" in
-Linux|GNU|GNU/*)
- # If the system lacks a compiler, then just pick glibc.
- # We could probably try harder.
- LIBC=gnu
-
- eval $set_cc_for_build
- cat <<-EOF > $dummy.c
- #include <features.h>
- #if defined(__UCLIBC__)
- LIBC=uclibc
- #elif defined(__dietlibc__)
- LIBC=dietlibc
- #else
- LIBC=gnu
- #endif
- EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
- ;;
-esac
-
-case "${UNAME_MACHINE}" in
- i?86)
- test -z "$VENDOR" && VENDOR=pc
- ;;
- *)
- test -z "$VENDOR" && VENDOR=unknown
- ;;
-esac
-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
-
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -227,23 +200,23 @@
exit ;;
*:Bitrig:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
- echo ${UNAME_MACHINE_ARCH}-${VENDOR}-bitrig${UNAME_RELEASE}
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
exit ;;
*:OpenBSD:*:*)
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
exit ;;
*:ekkoBSD:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
exit ;;
*:SolidBSD:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
exit ;;
macppc:MirBSD:*:*)
- echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
exit ;;
*:MirBSD:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
@@ -311,13 +284,13 @@
echo alpha-dec-winnt3.5
exit ;;
Amiga*:UNIX_System_V:4.0:*)
- echo m68k-${VENDOR}-sysv4
+ echo m68k-unknown-sysv4
exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-amigaos
+ echo ${UNAME_MACHINE}-unknown-amigaos
exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-morphos
+ echo ${UNAME_MACHINE}-unknown-morphos
exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
@@ -332,7 +305,7 @@
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
arm*:riscos:*:*|arm*:RISCOS:*:*)
- echo arm-${VENDOR}-riscos
+ echo arm-unknown-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
@@ -440,7 +413,7 @@
echo m68k-hades-mint${UNAME_RELEASE}
exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-${VENDOR}-mint${UNAME_RELEASE}
+ echo m68k-unknown-mint${UNAME_RELEASE}
exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
@@ -751,9 +724,9 @@
exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
- echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
+ echo ${UNAME_MACHINE}-unknown-osf1mk
else
- echo ${UNAME_MACHINE}-${VENDOR}-osf1
+ echo ${UNAME_MACHINE}-unknown-osf1
fi
exit ;;
parisc*:Lites*:*:*)
@@ -813,18 +786,18 @@
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit ;;
sparc*:BSD/OS:*:*)
- echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
+ echo sparc-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
exit ;;
*:FreeBSD:*:*)
UNAME_PROCESSOR=`/usr/bin/uname -p`
case ${UNAME_PROCESSOR} in
amd64)
- echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*)
- echo ${UNAME_PROCESSOR}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac
exit ;;
i*:CYGWIN*:*)
@@ -852,10 +825,10 @@
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
authenticamd | genuineintel | EM64T)
- echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
+ echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
- echo ia64-${VENDOR}-interix${UNAME_RELEASE}
+ echo ia64-unknown-interix${UNAME_RELEASE}
exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -874,31 +847,31 @@
echo ${UNAME_MACHINE}-pc-uwin
exit ;;
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- echo x86_64-${VENDOR}-cygwin
+ echo x86_64-unknown-cygwin
exit ;;
p*:CYGWIN*:*)
- echo powerpcle-${VENDOR}-cygwin
+ echo powerpcle-unknown-cygwin
exit ;;
prep*:SunOS:5.*:*)
- echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
*:GNU:*:*)
# the GNU system
- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit ;;
aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -911,54 +884,59 @@
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
- exit ;;
- arc:Linux:*:* | arceb:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
arm*:Linux:*:*)
eval $set_cc_for_build
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_EABI__
then
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
else
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
| grep -q __ARM_PCS_VFP
then
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabi
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
else
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}eabihf
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
fi
fi
exit ;;
avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
cris:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
crisv32:Linux:*:*)
- echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+ echo ${UNAME_MACHINE}-axis-linux-gnu
exit ;;
frv:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
hexagon:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+ LIBC=gnu
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit ;;
ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
m32r*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
@@ -977,63 +955,54 @@
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-${LIBC}"; exit; }
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
- or1k:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
- exit ;;
or32:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
padre:Linux:*:*)
- echo sparc-${VENDOR}-linux-${LIBC}
+ echo sparc-unknown-linux-gnu
exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
- echo hppa64-${VENDOR}-linux-${LIBC}
+ echo hppa64-unknown-linux-gnu
exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
- PA7*) echo hppa1.1-${VENDOR}-linux-${LIBC} ;;
- PA8*) echo hppa2.0-${VENDOR}-linux-${LIBC} ;;
- *) echo hppa-${VENDOR}-linux-${LIBC} ;;
+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
esac
exit ;;
ppc64:Linux:*:*)
- echo powerpc64-${VENDOR}-linux-${LIBC}
+ echo powerpc64-unknown-linux-gnu
exit ;;
ppc:Linux:*:*)
- echo powerpc-${VENDOR}-linux-${LIBC}
- exit ;;
- ppc64le:Linux:*:*)
- echo powerpc64le-${VENDOR}-linux-${LIBC}
- exit ;;
- ppcle:Linux:*:*)
- echo powerpcle-${VENDOR}-linux-${LIBC}
+ echo powerpc-unknown-linux-gnu
exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+ echo ${UNAME_MACHINE}-ibm-linux
exit ;;
sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+ echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1055,16 +1024,16 @@
echo ${UNAME_MACHINE}-pc-os2-emx
exit ;;
i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-${VENDOR}-stop
+ echo ${UNAME_MACHINE}-unknown-stop
exit ;;
i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-atheos
+ echo ${UNAME_MACHINE}-unknown-atheos
exit ;;
i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-${VENODR}-lynxos${UNAME_RELEASE}
+ echo i386-unknown-lynxos${UNAME_RELEASE}
exit ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
@@ -1084,7 +1053,7 @@
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
- echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
@@ -1123,7 +1092,7 @@
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-${VENODR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
fi
exit ;;
mini*:CTIX:SYS*5:*)
@@ -1160,19 +1129,19 @@
/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
&& { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit ;;
TSUNAMI:LynxOS:2.*:*)
- echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
+ echo sparc-unknown-lynxos${UNAME_RELEASE}
exit ;;
rs6000:LynxOS:2.*:*)
- echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
@@ -1222,7 +1191,7 @@
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
- echo mips-${VENDOR}-sysv${UNAME_RELEASE}
+ echo mips-unknown-sysv${UNAME_RELEASE}
fi
exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
@@ -1238,7 +1207,7 @@
echo i586-pc-haiku
exit ;;
x86_64:Haiku:*:*)
- echo x86_64-${VENDOR}-haiku
+ echo x86_64-unknown-haiku
exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
@@ -1266,21 +1235,19 @@
exit ;;
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- eval $set_cc_for_build
- if test "$UNAME_PROCESSOR" = unknown ; then
- UNAME_PROCESSOR=powerpc
- fi
- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
- grep IS_64BIT_ARCH >/dev/null
- then
- case $UNAME_PROCESSOR in
- i386) UNAME_PROCESSOR=x86_64 ;;
- powerpc) UNAME_PROCESSOR=powerpc64 ;;
- esac
- fi
- fi
+ case $UNAME_PROCESSOR in
+ i386)
+ eval $set_cc_for_build
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ UNAME_PROCESSOR="x86_64"
+ fi
+ fi ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1321,13 +1288,13 @@
else
UNAME_MACHINE="$cputype"
fi
- echo ${UNAME_MACHINE}-${VENDOR}-plan9
+ echo ${UNAME_MACHINE}-unknown-plan9
exit ;;
*:TOPS-10:*:*)
- echo pdp10-${VENDOR}-tops10
+ echo pdp10-unknown-tops10
exit ;;
*:TENEX:*:*)
- echo pdp10-${VENDOR}-tenex
+ echo pdp10-unknown-tenex
exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
@@ -1336,16 +1303,16 @@
echo pdp10-xkl-tops20
exit ;;
*:TOPS-20:*:*)
- echo pdp10-${VENDOR}-tops20
+ echo pdp10-unknown-tops20
exit ;;
*:ITS:*:*)
- echo pdp10-${VENDOR}-its
+ echo pdp10-unknown-its
exit ;;
SEI:*:*:SEIUX)
echo mips-sei-seiux${UNAME_RELEASE}
exit ;;
*:DragonFly:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
*:*VMS:*:*)
UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1367,7 +1334,7 @@
echo ${UNAME_MACHINE}-pc-aros
exit ;;
x86_64:VMkernel:*:*)
- echo ${UNAME_MACHINE}-${VENDOR}-esx
+ echo ${UNAME_MACHINE}-unknown-esx
exit ;;
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/config.sub new/libabw-0.0.2/config.sub
--- old/libabw-0.0.1/config.sub 2014-01-14 17:01:58.000000000 +0100
+++ new/libabw-0.0.2/config.sub 2014-02-10 15:41:56.000000000 +0100
@@ -1,8 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2013 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+# 2011, 2012, 2013 Free Software Foundation, Inc.
-timestamp='2013-04-24'
+timestamp='2012-12-29'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -68,7 +70,9 @@
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -252,7 +256,7 @@
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arceb \
+ | arc \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
| be32 | be64 \
@@ -286,17 +290,16 @@
| mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
- | mipsr5900 | mipsr5900el \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
| moxie \
| mt \
| msp430 \
| nds32 | nds32le | nds32be \
- | nios | nios2 | nios2eb | nios2el \
+ | nios | nios2 \
| ns16k | ns32k \
| open8 \
- | or1k | or32 \
+ | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
@@ -366,7 +369,7 @@
| aarch64-* | aarch64_be-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* | avr32-* \
| be32-* | be64-* \
@@ -404,13 +407,12 @@
| mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
- | mipsr5900-* | mipsr5900el-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
| mt-* \
| msp430-* \
| nds32-* | nds32le-* | nds32be-* \
- | nios-* | nios2-* | nios2eb-* | nios2el-* \
+ | nios-* | nios2-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| open8-* \
| orion-* \
@@ -1006,7 +1008,7 @@
;;
ppc64) basic_machine=powerpc64-unknown
;;
- ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
@@ -1352,7 +1354,7 @@
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* | -plan9* \
+ | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1498,6 +1500,9 @@
-aros*)
os=-aros
;;
+ -kaos*)
+ os=-kaos
+ ;;
-zvmoe)
os=-zvmoe
;;
@@ -1589,9 +1594,6 @@
mips*-*)
os=-elf
;;
- or1k-*)
- os=-elf
- ;;
or32-*)
os=-coff
;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/configure new/libabw-0.0.2/configure
--- old/libabw-0.0.1/configure 2014-01-15 09:41:42.000000000 +0100
+++ new/libabw-0.0.2/configure 2014-02-10 15:49:16.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libabw 0.0.1.
+# Generated by GNU Autoconf 2.69 for libabw 0.0.2.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@
# Identity of this package.
PACKAGE_NAME='libabw'
PACKAGE_TARNAME='libabw'
-PACKAGE_VERSION='0.0.1'
-PACKAGE_STRING='libabw 0.0.1'
+PACKAGE_VERSION='0.0.2'
+PACKAGE_STRING='libabw 0.0.2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1372,7 +1372,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures libabw 0.0.1 to adapt to many kinds of systems.
+\`configure' configures libabw 0.0.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1442,7 +1442,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libabw 0.0.1:";;
+ short | recursive ) echo "Configuration of libabw 0.0.2:";;
esac
cat <<\_ACEOF
@@ -1574,7 +1574,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libabw configure 0.0.1
+libabw configure 0.0.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2091,7 +2091,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by libabw $as_me 0.0.1, which was
+It was created by libabw $as_me 0.0.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2957,7 +2957,7 @@
# Define the identity of the package.
PACKAGE='libabw'
- VERSION='0.0.1'
+ VERSION='0.0.2'
cat >>confdefs.h <<_ACEOF
@@ -7541,7 +7541,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7559,7 +7559,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -7578,7 +7581,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -11897,10 +11903,14 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -15728,10 +15738,14 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -16079,9 +16093,9 @@
ABW_MINOR_VERSION=0
-ABW_MICRO_VERSION=1
+ABW_MICRO_VERSION=2
-ABW_VERSION=0.0.1
+ABW_VERSION=0.0.2
# AC_SUBST(LT_RELEASE, [libabw_version_major.libabw_version_minor])
LT_CURRENT=`expr 100 '*' 0 + 0`
@@ -16089,7 +16103,7 @@
LT_AGE=0
# LT_AGE=libabw_version_minor
-LT_REVISION=1
+LT_REVISION=2
@@ -17787,7 +17801,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by libabw $as_me 0.0.1, which was
+This file was extended by libabw $as_me 0.0.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17853,7 +17867,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-libabw config.status 0.0.1
+libabw config.status 0.0.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/configure.ac new/libabw-0.0.2/configure.ac
--- old/libabw-0.0.1/configure.ac 2014-01-15 09:41:35.000000000 +0100
+++ new/libabw-0.0.2/configure.ac 2014-02-10 15:47:05.000000000 +0100
@@ -7,7 +7,7 @@
# ====================
m4_define([libabw_version_major],[0])
m4_define([libabw_version_minor],[0])
-m4_define([libabw_version_micro],[1])
+m4_define([libabw_version_micro],[2])
m4_define([libabw_version],[libabw_version_major.libabw_version_minor.libabw_version_micro])
# =============
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/m4/libtool.m4 new/libabw-0.0.2/m4/libtool.m4
--- old/libabw-0.0.1/m4/libtool.m4 2014-01-14 17:01:55.000000000 +0100
+++ new/libabw-0.0.2/m4/libtool.m4 2014-02-10 15:41:46.000000000 +0100
@@ -1312,7 +1312,7 @@
rm -rf conftest*
;;
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -1326,7 +1326,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf32lppclinux"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1345,7 +1348,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- ppc*-*linux*|powerpc*-*linux*)
+ powerpcle-*linux*)
+ LD="${LD-ld} -m elf64lppc"
+ ;;
+ powerpc-*linux*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -2669,10 +2675,14 @@
# before this can be enabled.
hardcode_into_libs=yes
+ # Add ABI-specific directories to the system library path.
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
+
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWCollector.h new/libabw-0.0.2/src/lib/ABWCollector.h
--- old/libabw-0.0.1/src/lib/ABWCollector.h 2014-01-15 09:41:35.000000000 +0100
+++ new/libabw-0.0.2/src/lib/ABWCollector.h 2014-02-10 15:41:38.000000000 +0100
@@ -128,7 +128,7 @@
virtual void insertLineBreak() = 0;
virtual void insertColumnBreak() = 0;
virtual void insertPageBreak() = 0;
- virtual void insertText(const WPXString &text) = 0;
+ virtual void insertText(const char *text) = 0;
virtual void insertImage(const char *dataid, const char *props) = 0;
virtual void collectList(const char *id, const char *listDecimal, const char *listDelim,
const char *parentid, const char *startValue, const char *type) = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWContentCollector.cpp new/libabw-0.0.2/src/lib/ABWContentCollector.cpp
--- old/libabw-0.0.1/src/lib/ABWContentCollector.cpp 2014-01-15 09:41:35.000000000 +0100
+++ new/libabw-0.0.2/src/lib/ABWContentCollector.cpp 2014-02-10 15:41:38.000000000 +0100
@@ -319,6 +319,7 @@
m_isNote(false),
m_currentListLevel(0),
m_currentListId(0),
+ m_isFirstTextInListElement(false),
m_tableStates(),
m_listLevels()
@@ -365,6 +366,7 @@
m_isNote(ps.m_isNote),
m_currentListLevel(ps.m_currentListLevel),
m_currentListId(ps.m_currentListId),
+ m_isFirstTextInListElement(ps.m_isFirstTextInListElement),
m_tableStates(ps.m_tableStates),
m_listLevels(ps.m_listLevels)
@@ -641,7 +643,7 @@
if (!type)
m_ps->m_currentHeaderFooterId = -1;
- std::string sType(type);
+ std::string sType(type ? type : "");
boost::trim(sType);
std::vector<std::string> strVec;
boost::algorithm::split(strVec, sType, boost::is_any_of("-"), boost::token_compress_on);
@@ -809,14 +811,19 @@
m_ps->m_deferredPageBreak = true;
}
-void libabw::ABWContentCollector::insertText(const WPXString &text)
+void libabw::ABWContentCollector::insertText(const char *text)
{
if (!m_ps->m_inParagraphOrListElement)
return;
if (!m_ps->m_isSpanOpened)
_openSpan();
-
- separateSpacesAndInsertText(m_outputElements, text);
+ if (!text)
+ return;
+ if (m_ps->m_isFirstTextInListElement && text[0] == '\t')
+ separateSpacesAndInsertText(m_outputElements, text+1);
+ else
+ separateSpacesAndInsertText(m_outputElements, text);
+ m_ps->m_isFirstTextInListElement = false;
}
void libabw::ABWContentCollector::_openPageSpan()
@@ -1081,6 +1088,7 @@
m_ps->m_isListElementOpened = true;
if (!m_ps->m_tableStates.empty())
m_ps->m_tableStates.top().m_isCellWithoutParagraph = false;
+ m_ps->m_isFirstTextInListElement = true;
}
}
@@ -1484,26 +1492,32 @@
void libabw::ABWContentCollector::openCell(const char *props)
{
- if (props)
- parsePropString(props, m_ps->m_tableStates.top().m_currentCellProperties);
- int currentRow(0);
- if (!findInt(_findCellProperty("top-attach"), currentRow))
- currentRow = m_ps->m_tableStates.top().m_currentTableRow + 1;
- while (m_ps->m_tableStates.top().m_currentTableRow < currentRow)
+ if (!m_ps->m_tableStates.empty())
{
- if (m_ps->m_tableStates.top().m_currentTableRow >= 0)
- _closeTableRow();
- _openTableRow();
- }
+ if (props)
+ parsePropString(props, m_ps->m_tableStates.top().m_currentCellProperties);
+ int currentRow(0);
+ if (!findInt(_findCellProperty("top-attach"), currentRow))
+ currentRow = m_ps->m_tableStates.top().m_currentTableRow + 1;
+ while (m_ps->m_tableStates.top().m_currentTableRow < currentRow)
+ {
+ if (m_ps->m_tableStates.top().m_currentTableRow >= 0)
+ _closeTableRow();
+ _openTableRow();
+ }
- if (!findInt(_findCellProperty("left-attach"), m_ps->m_tableStates.top().m_currentTableCol))
- m_ps->m_tableStates.top().m_currentTableCol++;
+ if (!findInt(_findCellProperty("left-attach"), m_ps->m_tableStates.top().m_currentTableCol))
+ m_ps->m_tableStates.top().m_currentTableCol++;
+ }
}
void libabw::ABWContentCollector::closeCell()
{
- _closeTableCell();
- m_ps->m_tableStates.top().m_currentCellProperties.clear();
+ if (!m_ps->m_tableStates.empty())
+ {
+ _closeTableCell();
+ m_ps->m_tableStates.top().m_currentCellProperties.clear();
+ }
}
void libabw::ABWContentCollector::collectData(const char *, const char *, const WPXBinaryData &)
@@ -1625,6 +1639,7 @@
m_outputElements.addCloseListElement();
}
m_ps->m_isListElementOpened = false;
+ m_ps->m_isFirstTextInListElement = false;
}
/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWContentCollector.h new/libabw-0.0.2/src/lib/ABWContentCollector.h
--- old/libabw-0.0.1/src/lib/ABWContentCollector.h 2014-01-15 09:41:35.000000000 +0100
+++ new/libabw-0.0.2/src/lib/ABWContentCollector.h 2014-02-10 15:41:38.000000000 +0100
@@ -102,6 +102,7 @@
int m_currentListLevel;
int m_currentListId;
+ bool m_isFirstTextInListElement;
std::stack<ABWContentTableState> m_tableStates;
std::stack<std::pair<int, ABWListElement *> > m_listLevels;
@@ -138,7 +139,7 @@
void insertLineBreak();
void insertColumnBreak();
void insertPageBreak();
- void insertText(const WPXString &text);
+ void insertText(const char *text);
void insertImage(const char *dataid, const char *props);
void collectList(const char *, const char *, const char *, const char *, const char *, const char *) {}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWParser.cpp new/libabw-0.0.2/src/lib/ABWParser.cpp
--- old/libabw-0.0.1/src/lib/ABWParser.cpp 2014-01-15 09:41:35.000000000 +0100
+++ new/libabw-0.0.2/src/lib/ABWParser.cpp 2014-02-10 15:41:38.000000000 +0100
@@ -143,7 +143,7 @@
if (!input)
return false;
- xmlTextReaderPtr reader = xmlReaderForStream(input, 0, 0, XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER);
+ xmlTextReaderPtr reader = xmlReaderForStream(input);
if (!reader)
return false;
int ret = xmlTextReaderRead(reader);
@@ -171,8 +171,8 @@
int emptyToken = xmlTextReaderIsEmptyElement(reader);
if (XML_READER_TYPE_TEXT == tokenType)
{
- WPXString text((const char *)xmlTextReaderConstValue(reader));
- ABW_DEBUG_MSG(("ABWParser::processXmlNode: text %s\n", text.cstr()));
+ const char *text = (const char *)xmlTextReaderConstValue(reader);
+ ABW_DEBUG_MSG(("ABWParser::processXmlNode: text %s\n", text));
m_collector->insertText(text);
}
switch (tokenId)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWStylesCollector.cpp new/libabw-0.0.2/src/lib/ABWStylesCollector.cpp
--- old/libabw-0.0.1/src/lib/ABWStylesCollector.cpp 2014-01-15 09:41:35.000000000 +0100
+++ new/libabw-0.0.2/src/lib/ABWStylesCollector.cpp 2014-02-10 15:41:38.000000000 +0100
@@ -49,10 +49,10 @@
NOT_A_LIST = 0xff
};
-static int abw_unichar_to_utf8(uint32_t c, char *outbuf)
+static int abw_unichar_to_utf8(unsigned c, char *outbuf)
{
- uint8_t len = 1;
- uint8_t first = 0;
+ unsigned char len = 1;
+ unsigned char first = 0;
if (c < 0x80)
{
@@ -87,7 +87,7 @@
if (outbuf)
{
- for (uint8_t i = (uint8_t)(len - 1); i > 0; --i)
+ for (unsigned char i = (unsigned char)(len - 1); i > 0; --i)
{
outbuf[i] = (char)((c & 0x3f) | 0x80);
c >>= 6;
@@ -98,7 +98,7 @@
return len;
}
-static void appendUCS4(WPXString &str, uint32_t ucs4)
+static void appendUCS4(WPXString &str, unsigned ucs4)
{
int charLength = abw_unichar_to_utf8(ucs4, 0);
char *utf8 = new char[charLength+1];
@@ -167,28 +167,32 @@
void libabw::ABWStylesCollector::openCell(const char *props)
{
- if (props)
- parsePropString(props, m_ps->m_tableStates.top().m_currentCellProperties);
- int currentRow(0);
- if (!findInt(_findCellProperty("top-attach"), currentRow))
- currentRow = m_ps->m_tableStates.top().m_currentTableRow + 1;
- while (m_ps->m_tableStates.top().m_currentTableRow < currentRow)
- m_ps->m_tableStates.top().m_currentTableRow++;
-
- if (!m_ps->m_tableStates.empty() && 0 == m_ps->m_tableStates.top().m_currentTableRow)
- {
- int leftAttach(0);
- int rightAttach(0);
- if (findInt(_findCellProperty("left-attach"), leftAttach) && findInt(_findCellProperty("right-attach"), rightAttach))
- m_ps->m_tableStates.top().m_currentTableWidth += rightAttach - leftAttach;
- else
- m_ps->m_tableStates.top().m_currentTableWidth++;
+ if (!m_ps->m_tableStates.empty())
+ {
+ if (props)
+ parsePropString(props, m_ps->m_tableStates.top().m_currentCellProperties);
+ int currentRow(0);
+ if (!findInt(_findCellProperty("top-attach"), currentRow))
+ currentRow = m_ps->m_tableStates.top().m_currentTableRow + 1;
+ while (m_ps->m_tableStates.top().m_currentTableRow < currentRow)
+ m_ps->m_tableStates.top().m_currentTableRow++;
+
+ if (0 == m_ps->m_tableStates.top().m_currentTableRow)
+ {
+ int leftAttach(0);
+ int rightAttach(0);
+ if (findInt(_findCellProperty("left-attach"), leftAttach) && findInt(_findCellProperty("right-attach"), rightAttach))
+ m_ps->m_tableStates.top().m_currentTableWidth += rightAttach - leftAttach;
+ else
+ m_ps->m_tableStates.top().m_currentTableWidth++;
+ }
}
}
void libabw::ABWStylesCollector::closeCell()
{
- m_ps->m_tableStates.top().m_currentCellProperties.clear();
+ if (!m_ps->m_tableStates.empty())
+ m_ps->m_tableStates.top().m_currentCellProperties.clear();
}
std::string libabw::ABWStylesCollector::_findCellProperty(const char *name)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWStylesCollector.h new/libabw-0.0.2/src/lib/ABWStylesCollector.h
--- old/libabw-0.0.1/src/lib/ABWStylesCollector.h 2014-01-15 09:41:35.000000000 +0100
+++ new/libabw-0.0.2/src/lib/ABWStylesCollector.h 2014-02-10 15:41:38.000000000 +0100
@@ -71,7 +71,7 @@
void insertLineBreak() {}
void insertColumnBreak() {}
void insertPageBreak() {}
- void insertText(const WPXString &) {}
+ void insertText(const char *) {}
void insertImage(const char *, const char *) {}
void collectData(const char *name, const char *mimeType, const WPXBinaryData &data);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWXMLHelper.cpp new/libabw-0.0.2/src/lib/ABWXMLHelper.cpp
--- old/libabw-0.0.1/src/lib/ABWXMLHelper.cpp 2014-01-15 09:41:35.000000000 +0100
+++ new/libabw-0.0.2/src/lib/ABWXMLHelper.cpp 2014-02-10 15:41:38.000000000 +0100
@@ -73,9 +73,10 @@
// xmlTextReader helper function
-xmlTextReaderPtr libabw::xmlReaderForStream(WPXInputStream *input, const char *URL, const char *encoding, int options)
+xmlTextReaderPtr libabw::xmlReaderForStream(WPXInputStream *input)
{
- xmlTextReaderPtr reader = xmlReaderForIO(abwxmlInputReadFunc, abwxmlInputCloseFunc, (void *)input, URL, encoding, options);
+ xmlTextReaderPtr reader = xmlReaderForIO(abwxmlInputReadFunc, abwxmlInputCloseFunc, (void *)input, 0, 0,
+ XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER);
xmlTextReaderSetErrorHandler(reader, abwxmlReaderErrorFunc, 0);
return reader;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWXMLHelper.h new/libabw-0.0.2/src/lib/ABWXMLHelper.h
--- old/libabw-0.0.1/src/lib/ABWXMLHelper.h 2014-01-15 09:41:35.000000000 +0100
+++ new/libabw-0.0.2/src/lib/ABWXMLHelper.h 2014-02-10 15:41:38.000000000 +0100
@@ -19,10 +19,7 @@
// create an xmlTextReader pointer from a WPXInputStream pointer
// needs to be freed using xmlTextReaderFree function.
-xmlTextReaderPtr xmlReaderForStream(WPXInputStream *input,
- const char *URL,
- const char *encoding,
- int options);
+xmlTextReaderPtr xmlReaderForStream(WPXInputStream *input);
} // namespace libabw
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/src/lib/ABWZlibStream.cpp new/libabw-0.0.2/src/lib/ABWZlibStream.cpp
--- old/libabw-0.0.1/src/lib/ABWZlibStream.cpp 2014-01-15 09:41:35.000000000 +0100
+++ new/libabw-0.0.2/src/lib/ABWZlibStream.cpp 2014-02-10 15:41:38.000000000 +0100
@@ -54,7 +54,6 @@
switch (ret)
{
case Z_NEED_DICT:
- ret = Z_DATA_ERROR;
case Z_DATA_ERROR:
case Z_MEM_ERROR:
case Z_STREAM_ERROR:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/src/lib/AbiDocument.cpp new/libabw-0.0.2/src/lib/AbiDocument.cpp
--- old/libabw-0.0.1/src/lib/AbiDocument.cpp 2014-01-15 09:41:35.000000000 +0100
+++ new/libabw-0.0.2/src/lib/AbiDocument.cpp 2014-02-10 15:41:38.000000000 +0100
@@ -39,13 +39,13 @@
ABW_DEBUG_MSG(("AbiDocument::isFileFormatSupported\n"));
if (!input)
return false;
- input->seek(0, WPX_SEEK_SET);
- libabw::ABWZlibStream stream(input);
xmlTextReaderPtr reader = 0;
try
{
+ input->seek(0, WPX_SEEK_SET);
+ libabw::ABWZlibStream stream(input);
stream.seek(0, WPX_SEEK_SET);
- reader = libabw::xmlReaderForStream(&stream, 0, 0, XML_PARSE_NOBLANKS|XML_PARSE_NOENT|XML_PARSE_NONET|XML_PARSE_RECOVER);
+ reader = libabw::xmlReaderForStream(&stream);
if (!reader)
return false;
int ret = xmlTextReaderRead(reader);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libabw-0.0.1/src/lib/tokenhash.h new/libabw-0.0.2/src/lib/tokenhash.h
--- old/libabw-0.0.1/src/lib/tokenhash.h 2014-01-14 17:09:34.000000000 +0100
+++ new/libabw-0.0.2/src/lib/tokenhash.h 2014-02-10 15:49:43.000000000 +0100
@@ -46,143 +46,143 @@
class Perfect_Hash
{
private:
- static inline unsigned int hash(const char *str, unsigned int len);
+ static inline unsigned int hash (const char *str, unsigned int len);
public:
- static const struct xmltoken *in_word_set(const char *str, unsigned int len);
+ static const struct xmltoken *in_word_set (const char *str, unsigned int len);
};
inline unsigned int
-Perfect_Hash::hash(register const char *str, register unsigned int len)
+Perfect_Hash::hash (register const char *str, register unsigned int len)
{
static const unsigned char asso_values[] =
- {
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 1, 0, 14,
- 27, 3, 5, 21, 23, 0, 34, 34, 26, 8,
- 19, 17, 2, 34, 2, 6, 12, 34, 12, 18,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
- 34, 34, 34, 34, 34, 34
- };
+ {
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 1, 0, 14,
+ 27, 3, 5, 21, 23, 0, 34, 34, 26, 8,
+ 19, 17, 2, 34, 2, 6, 12, 34, 12, 18,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,
+ 34, 34, 34, 34, 34, 34
+ };
register int hval = len;
switch (hval)
- {
- default:
- hval += asso_values[(unsigned char)str[1]];
- /*FALLTHROUGH*/
- case 1:
- hval += asso_values[(unsigned char)str[0]];
- break;
- }
+ {
+ default:
+ hval += asso_values[(unsigned char)str[1]];
+ /*FALLTHROUGH*/
+ case 1:
+ hval += asso_values[(unsigned char)str[0]];
+ break;
+ }
return hval;
}
static const struct xmltoken wordlist[] =
-{
- {(char *)0, 0},
+ {
+ {(char*)0, 0},
#line 27 "../../src/lib/tokens.gperf"
- {"i",XML_I},
+ {"i",XML_I},
#line 11 "../../src/lib/tokens.gperf"
- {"a",XML_A},
+ {"a",XML_A},
#line 35 "../../src/lib/tokens.gperf"
- {"p",XML_P},
+ {"p",XML_P},
#line 15 "../../src/lib/tokens.gperf"
- {"br",XML_BR},
+ {"br",XML_BR},
#line 37 "../../src/lib/tokens.gperf"
- {"pbr",XML_PBR},
+ {"pbr",XML_PBR},
#line 22 "../../src/lib/tokens.gperf"
- {"f",XML_F},
+ {"f",XML_F},
#line 39 "../../src/lib/tokens.gperf"
- {"s",XML_S},
+ {"s",XML_S},
#line 12 "../../src/lib/tokens.gperf"
- {"abiword",XML_ABIWORD},
+ {"abiword",XML_ABIWORD},
#line 33 "../../src/lib/tokens.gperf"
- {"m",XML_M},
+ {"m",XML_M},
#line 23 "../../src/lib/tokens.gperf"
- {"field",XML_FIELD},
+ {"field",XML_FIELD},
#line 36 "../../src/lib/tokens.gperf"
- {"pagesize",XML_PAGESIZE},
+ {"pagesize",XML_PAGESIZE},
#line 25 "../../src/lib/tokens.gperf"
- {"frame",XML_FRAME},
+ {"frame",XML_FRAME},
#line 29 "../../src/lib/tokens.gperf"
- {"image",XML_IMAGE},
+ {"image",XML_IMAGE},
#line 38 "../../src/lib/tokens.gperf"
- {"revisions",XML_REVISIONS},
+ {"revisions",XML_REVISIONS},
#line 16 "../../src/lib/tokens.gperf"
- {"c",XML_C},
+ {"c",XML_C},
#line 40 "../../src/lib/tokens.gperf"
- {"section",XML_SECTION},
+ {"section",XML_SECTION},
#line 17 "../../src/lib/tokens.gperf"
- {"cbr",XML_CBR},
+ {"cbr",XML_CBR},
#line 42 "../../src/lib/tokens.gperf"
- {"table",XML_TABLE},
+ {"table",XML_TABLE},
#line 34 "../../src/lib/tokens.gperf"
- {"metadata",XML_METADATA},
+ {"metadata",XML_METADATA},
#line 30 "../../src/lib/tokens.gperf"
- {"iw",XML_IW},
+ {"iw",XML_IW},
#line 18 "../../src/lib/tokens.gperf"
- {"cell",XML_CELL},
+ {"cell",XML_CELL},
#line 43 "../../src/lib/tokens.gperf"
- {"version",XML_VERSION},
+ {"version",XML_VERSION},
#line 13 "../../src/lib/tokens.gperf"
- {"awml",XML_AWML},
+ {"awml",XML_AWML},
#line 41 "../../src/lib/tokens.gperf"
- {"styles",XML_STYLES},
+ {"styles",XML_STYLES},
#line 14 "../../src/lib/tokens.gperf"
- {"bookmark",XML_BOOKMARK},
+ {"bookmark",XML_BOOKMARK},
#line 24 "../../src/lib/tokens.gperf"
- {"foot",XML_FOOT},
+ {"foot",XML_FOOT},
#line 31 "../../src/lib/tokens.gperf"
- {"l",XML_L},
+ {"l",XML_L},
#line 19 "../../src/lib/tokens.gperf"
- {"d",XML_D},
+ {"d",XML_D},
#line 21 "../../src/lib/tokens.gperf"
- {"endnote",XML_ENDNOTE},
+ {"endnote",XML_ENDNOTE},
#line 26 "../../src/lib/tokens.gperf"
- {"history",XML_HISTORY},
+ {"history",XML_HISTORY},
#line 32 "../../src/lib/tokens.gperf"
- {"lists",XML_LISTS},
+ {"lists",XML_LISTS},
#line 20 "../../src/lib/tokens.gperf"
- {"data",XML_DATA},
+ {"data",XML_DATA},
#line 28 "../../src/lib/tokens.gperf"
- {"ignoredwords",XML_IGNOREDWORDS}
-};
+ {"ignoredwords",XML_IGNOREDWORDS}
+ };
const struct xmltoken *
-Perfect_Hash::in_word_set(register const char *str, register unsigned int len)
+Perfect_Hash::in_word_set (register const char *str, register unsigned int len)
{
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
- {
- register int key = hash(str, len);
-
- if (key <= MAX_HASH_VALUE && key >= 0)
{
- register const char *s = wordlist[key].name;
+ register int key = hash (str, len);
- if (s && *str == *s && !strncmp(str + 1, s + 1, len - 1) && s[len] == '\0')
- return &wordlist[key];
+ if (key <= MAX_HASH_VALUE && key >= 0)
+ {
+ register const char *s = wordlist[key].name;
+
+ if (s && *str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
+ return &wordlist[key];
+ }
}
- }
return 0;
}
#line 44 "../../src/lib/tokens.gperf"
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2014-02-28 07:20:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2014-02-20 07:54:56.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2014-02-28 07:20:50.000000000 +0100
@@ -1,0 +2,15 @@
+Thu Feb 27 02:22:31 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Added various bugfix patches from upstream 4.11 branch:
+ * 0001-Explicitly-request-a-Window-drawable.patch
+ * 0004-align-zoomed-cursor-to-hotspot.patch
+ * 0005-be-more-aggressive-about-exiting-zoom-effect.patch
+ * 0006-spatial-present-windows-zoom-calculation.patch
+ * 0007-fix-frontbuffer-copying-swap-preference.patch
+ * 0008-fix-sendToScreen-for-QuickTiled-windows.patch
+ * 0009-reset-desktopChangedWhileRotating-on-activation.patch
+ * 0010-ensure-to-show-clients-that-need-sessionInteract.patch
+ * 0011-fix-off-by-1-on-multiscreen-toppanel-strutting.patch
+ * 0012-Perform-the-systemd-version-evaluation-through-a-reg.patch
+
+-------------------------------------------------------------------
New:
----
0001-Explicitly-request-a-Window-drawable.patch
0004-align-zoomed-cursor-to-hotspot.patch
0005-be-more-aggressive-about-exiting-zoom-effect.patch
0006-spatial-present-windows-zoom-calculation.patch
0007-fix-frontbuffer-copying-swap-preference.patch
0008-fix-sendToScreen-for-QuickTiled-windows.patch
0009-reset-desktopChangedWhileRotating-on-activation.patch
0010-ensure-to-show-clients-that-need-sessionInteract.patch
0011-fix-off-by-1-on-multiscreen-toppanel-strutting.patch
0012-Perform-the-systemd-version-evaluation-through-a-reg.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.PuLx5K/_old 2014-02-28 07:20:51.000000000 +0100
+++ /var/tmp/diff_new_pack.PuLx5K/_new 2014-02-28 07:20:51.000000000 +0100
@@ -145,6 +145,26 @@
Patch65: kdm-backend-session.patch
# PATCH-FIX-OPENSUSE add-calculator-hotkey.patch -- Adds hotkey for Calculator button (bnc#726550)
Patch66: add-calculator-hotkey.patch
+# PATCH-FIX-UPSTREAM 0001-Explicitly-request-a-Window-drawable.patch
+Patch100: 0001-Explicitly-request-a-Window-drawable.patch
+# PATCH-FIX-UPSTREAM 0004-align-zoomed-cursor-to-hotspot.patch
+Patch101: 0004-align-zoomed-cursor-to-hotspot.patch
+# PATCH-FIX-UPSTREAM 0005-be-more-aggressive-about-exiting-zoom-effect.patch
+Patch102: 0005-be-more-aggressive-about-exiting-zoom-effect.patch
+# PATCH-FIX-UPSTREAM 0006-spatial-present-windows-zoom-calculation.patch
+Patch103: 0006-spatial-present-windows-zoom-calculation.patch
+# PATCH-FIX-UPSTREAM 0007-fix-frontbuffer-copying-swap-preference.patch
+Patch104: 0007-fix-frontbuffer-copying-swap-preference.patch
+# PATCH-FIX-UPSTREAM 0008-fix-sendToScreen-for-QuickTiled-windows.patch
+Patch105: 0008-fix-sendToScreen-for-QuickTiled-windows.patch
+# PATCH-FIX-UPSTREAM 0009-reset-desktopChangedWhileRotating-on-activation.patch
+Patch106: 0009-reset-desktopChangedWhileRotating-on-activation.patch
+# PATCH-FIX-UPSTREAM 0010-ensure-to-show-clients-that-need-sessionInteract.patch
+Patch107: 0010-ensure-to-show-clients-that-need-sessionInteract.patch
+# PATCH-FIX-UPSTREAM 0011-fix-off-by-1-on-multiscreen-toppanel-strutting.patch
+Patch108: 0011-fix-off-by-1-on-multiscreen-toppanel-strutting.patch
+# PATCH-FIX-UPSTREAM 0012-Perform-the-systemd-version-evaluation-through-a-reg.patch
+Patch109: 0012-Perform-the-systemd-version-evaluation-through-a-reg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-branding = %{_kde_branding_version}
Requires: %{name}-ksysguardd = %{version}
@@ -359,6 +379,16 @@
%patch64 -p1
%patch65 -p1
%patch66 -p1
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
+%patch106 -p1
+%patch107 -p1
+%patch108 -p1
+%patch109 -p1
cp %{SOURCE3} kwin/effects/cube/data/cubecap.png
++++++ 0001-Explicitly-request-a-Window-drawable.patch ++++++
>From ea7653821e83dc691ebcf8254c03eedc82c02d5f Mon Sep 17 00:00:00 2001
From: Ralf Jung <post(a)ralfj.de>
Date: Fri, 21 Feb 2014 17:42:40 +0100
Subject: [PATCH 01/12] Explicitly request a Window-drawable
REVIEW: 115937
---
kwin/glxbackend.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/kwin/glxbackend.cpp b/kwin/glxbackend.cpp
index ef2a989..172b32a 100644
--- a/kwin/glxbackend.cpp
+++ b/kwin/glxbackend.cpp
@@ -265,6 +265,7 @@ bool GlxBackend::initFbConfig()
{
const int attribs[] = {
GLX_RENDER_TYPE, GLX_RGBA_BIT,
+ GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
GLX_RED_SIZE, 1,
GLX_GREEN_SIZE, 1,
GLX_BLUE_SIZE, 1,
--
1.9.0
++++++ 0004-align-zoomed-cursor-to-hotspot.patch ++++++
>From 170f7b9aaeda32422e0df79e9963dbaabf0c31ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking(a)gmail.com>
Date: Mon, 3 Feb 2014 21:02:10 +0100
Subject: [PATCH 04/12] align zoomed cursor to hotspot
BUG: 330679
FIXED-IN: 4.11.7
REVIEW: 115453
---
kwin/effects/zoom/zoom.cpp | 3 ++-
kwin/effects/zoom/zoom.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/kwin/effects/zoom/zoom.cpp b/kwin/effects/zoom/zoom.cpp
index b06583d..343c957 100644
--- a/kwin/effects/zoom/zoom.cpp
+++ b/kwin/effects/zoom/zoom.cpp
@@ -182,6 +182,7 @@ void ZoomEffect::recreateTexture()
// turn the XcursorImage into a QImage that will be used to create the GLTexture/XRenderPicture.
imageWidth = ximg->width;
imageHeight = ximg->height;
+ cursorHotSpot = QPoint(ximg->xhot, ximg->yhot);
QImage img((uchar*)ximg->pixels, imageWidth, imageHeight, QImage::Format_ARGB32_Premultiplied);
if (effects->isOpenGLCompositing())
texture.reset(new GLTexture(img));
@@ -331,7 +332,7 @@ void ZoomEffect::paintScreen(int mask, QRegion region, ScreenPaintData& data)
w *= zoom;
h *= zoom;
}
- const QPoint p = effects->cursorPos();
+ const QPoint p = effects->cursorPos() - cursorHotSpot;
QRect rect(p.x() * zoom + data.xTranslation(), p.y() * zoom + data.yTranslation(), w, h);
if (texture) {
diff --git a/kwin/effects/zoom/zoom.h b/kwin/effects/zoom/zoom.h
index 7c49c59..604655e 100644
--- a/kwin/effects/zoom/zoom.h
+++ b/kwin/effects/zoom/zoom.h
@@ -112,6 +112,7 @@ private:
MousePointerType mousePointer;
int focusDelay;
QPoint cursorPoint;
+ QPoint cursorHotSpot;
QPoint focusPoint;
QPoint prevPoint;
QTime lastMouseEvent;
--
1.9.0
++++++ 0005-be-more-aggressive-about-exiting-zoom-effect.patch ++++++
>From fe42ff9c57b5c975b3fed58b9c536bf05f91b8ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking(a)gmail.com>
Date: Mon, 3 Feb 2014 21:03:26 +0100
Subject: [PATCH 05/12] be more aggressive about exiting zoom effect
CCBUG: 289336
REVIEW: 115453
---
kwin/effects/zoom/zoom.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kwin/effects/zoom/zoom.cpp b/kwin/effects/zoom/zoom.cpp
index 343c957..3918c59 100644
--- a/kwin/effects/zoom/zoom.cpp
+++ b/kwin/effects/zoom/zoom.cpp
@@ -398,7 +398,7 @@ void ZoomEffect::zoomOut()
{
source_zoom = zoom;
target_zoom /= zoomFactor;
- if (target_zoom < 1) {
+ if ((zoomFactor > 1 && target_zoom < 1.01) || (zoomFactor < 1 && target_zoom > 0.99)) {
target_zoom = 1;
if (polling) {
polling = false;
--
1.9.0
++++++ 0006-spatial-present-windows-zoom-calculation.patch ++++++
>From 6e5e5ca5ab580e8f14ac6a4082ba82efd68d47df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking(a)gmail.com>
Date: Tue, 4 Feb 2014 19:00:08 +0100
Subject: [PATCH 06/12] spatial present windows zoom calculation
instead 1/16 of the area, 1/4 of the bigger and 1/32
of the smaller screen/window ratio
(ie. a shaded window would typically zoom to 1/32 of the screen height)
BUG: 298402
FIXED-IN: 4.11.7
REVIEW: 115455
---
kwin/effects/presentwindows/presentwindows.cpp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/kwin/effects/presentwindows/presentwindows.cpp b/kwin/effects/presentwindows/presentwindows.cpp
index 14e2602..eedb0b5 100755
--- a/kwin/effects/presentwindows/presentwindows.cpp
+++ b/kwin/effects/presentwindows/presentwindows.cpp
@@ -340,7 +340,14 @@ void PresentWindowsEffect::paintWindow(EffectWindow *w, int mask, QRegion region
QRect area = effects->clientArea(FullScreenArea, w);
QSizeF effSize(w->width()*data.xScale(), w->height()*data.yScale());
- float tScale = sqrt((area.width()*area.height()) / (16.0*effSize.width()*effSize.height()));
+ const float xr = area.width()/effSize.width();
+ const float yr = area.height()/effSize.height();
+ float tScale = 0.0;
+ if (xr < yr) {
+ tScale = qMax(xr/4.0, yr/32.0);
+ } else {
+ tScale = qMax(xr/32.0, yr/4.0);
+ }
if (tScale < 1.05) {
tScale = 1.05;
}
--
1.9.0
++++++ 0007-fix-frontbuffer-copying-swap-preference.patch ++++++
>From b00cc9cda191795ceae874526c7bd57b2a832982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking(a)gmail.com>
Date: Thu, 6 Feb 2014 00:16:06 +0100
Subject: [PATCH 07/12] fix frontbuffer copying swap preference
REVIEW: 115523
CCBUG: 330794
CCBUG: 322060
---
kwin/scene_opengl.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kwin/scene_opengl.cpp b/kwin/scene_opengl.cpp
index 27c9ab8..77aec3c 100644
--- a/kwin/scene_opengl.cpp
+++ b/kwin/scene_opengl.cpp
@@ -398,7 +398,7 @@ qint64 SceneOpenGL::paint(QRegion damage, ToplevelList toplevels)
glReadBuffer(GL_FRONT);
copyPixels(displayRegion - validRegion);
glReadBuffer(GL_BACK);
- damage = displayRegion;
+ validRegion = displayRegion;
}
#endif
--
1.9.0
++++++ 0008-fix-sendToScreen-for-QuickTiled-windows.patch ++++++
>From ccf7b2bb3aaebaa2e1a49a66a6de86e9517ff28b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking(a)gmail.com>
Date: Thu, 6 Feb 2014 18:36:11 +0100
Subject: [PATCH 08/12] fix sendToScreen for QuickTiled windows
two-fold issue
a) setMaximize implicitly sets QuickTileMaximize; setting it again toggles it off
b) setting quicktile mode needs to happen in keyboard mode and thenn the target
still depends on the current windo position, so the untiled window needs to
be in a sane location (while geom_restore will typically be off-screen when
quick tiling by mouse)
BUG: 330819
FIXED-IN:4.11.7
REVIEW: 115521
---
kwin/geometry.cpp | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/kwin/geometry.cpp b/kwin/geometry.cpp
index 87edec4..2e3f26f 100644
--- a/kwin/geometry.cpp
+++ b/kwin/geometry.cpp
@@ -3294,11 +3294,20 @@ void Client::sendToScreen(int newScreen)
// so we clear the state first
MaximizeMode maxMode = maximizeMode();
QuickTileMode qtMode = (QuickTileMode)quick_tile_mode;
- maximize(MaximizeRestore);
- setQuickTileMode(QuickTileNone);
+ if (maxMode != MaximizeRestore)
+ maximize(MaximizeRestore);
+ if (qtMode != QuickTileNone)
+ setQuickTileMode(QuickTileNone, true);
QRect oldScreenArea = workspace()->clientArea(MaximizeArea, this);
QRect screenArea = workspace()->clientArea(MaximizeArea, newScreen, desktop());
+
+ // the window can have its center so that the position correction moves the new center onto
+ // the old screen, what will tile it where it is. Ie. the screen is not changed
+ // this happens esp. with electric border quicktiling
+ if (qtMode != QuickTileNone)
+ keepInArea(oldScreenArea);
+
QRect oldGeom = geometry();
QRect newGeom = oldGeom;
// move the window to have the same relative position to the center of the screen
@@ -3328,8 +3337,8 @@ void Client::sendToScreen(int newScreen)
// eg. setting QuickTileNone would break maximization
if (maxMode != MaximizeRestore)
maximize(maxMode);
- if (qtMode != QuickTileNone)
- setQuickTileMode(qtMode);
+ if (qtMode != QuickTileNone && qtMode != quick_tile_mode)
+ setQuickTileMode(qtMode, true);
ClientList tso = workspace()->ensureStackingOrder(transients());
for (ClientList::ConstIterator it = tso.constBegin(), end = tso.constEnd(); it != end; ++it)
--
1.9.0
++++++ 0009-reset-desktopChangedWhileRotating-on-activation.patch ++++++
>From 3f1b48c65913e06047c38ff07760d30d2053ce96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking(a)gmail.com>
Date: Fri, 21 Feb 2014 15:00:55 +0100
Subject: [PATCH 09/12] reset desktopChangedWhileRotating on activation
BUG: 331148
FIXED-IN: 4.11.7
REVIEW: 115942
---
kwin/effects/cube/cube.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/kwin/effects/cube/cube.cpp b/kwin/effects/cube/cube.cpp
index b8b20a3..0ad1c2b 100644
--- a/kwin/effects/cube/cube.cpp
+++ b/kwin/effects/cube/cube.cpp
@@ -1922,6 +1922,7 @@ void CubeEffect::setActive(bool active)
verticalRotating = false;
manualAngle = 0.0;
manualVerticalAngle = 0.0;
+ desktopChangedWhileRotating = false;
if (reflection) {
QRect rect = effects->clientArea(FullArea, activeScreen, effects->currentDesktop());
#ifndef KWIN_HAVE_OPENGLES
--
1.9.0
++++++ 0010-ensure-to-show-clients-that-need-sessionInteract.patch ++++++
>From 3e64e642f831e02daee2802db4234314d12208f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking(a)gmail.com>
Date: Sat, 22 Feb 2014 15:55:56 +0100
Subject: [PATCH 10/12] ensure to show clients that need sessionInteract
transients of minimized windows are not shown, thus missed
the sessionSavin branch
since window input is also largely blocked (eg. taskbar!)
they cannot easily be unshown (including their transients)
and thus block logout forever
REVIEW: 115955
---
kwin/manage.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kwin/manage.cpp b/kwin/manage.cpp
index 473d17e..55690ca 100644
--- a/kwin/manage.cpp
+++ b/kwin/manage.cpp
@@ -453,7 +453,7 @@ bool Client::manage(xcb_window_t w, bool isMapped)
init_minimize = false; // SELI TODO: Even e.g. for NET::Utility?
}
// If a dialog is shown for minimized window, minimize it too
- if (!init_minimize && isTransient() && mainClients().count() > 0) {
+ if (!init_minimize && isTransient() && mainClients().count() > 0 && !workspace()->sessionSaving()) {
bool visible_parent = false;
// Use allMainClients(), to include also main clients of group transients
// that have been optimized out in Client::checkGroupTransients()
@@ -568,6 +568,7 @@ bool Client::manage(xcb_window_t w, bool isMapped)
for (ClientList::ConstIterator it = mainclients.constBegin();
it != mainclients.constEnd(); ++it) {
(*it)->setSessionInteract(true);
+ (*it)->unminimize();
}
} else if (allow) {
// also force if activation is allowed
--
1.9.0
++++++ 0011-fix-off-by-1-on-multiscreen-toppanel-strutting.patch ++++++
>From 4737dac68b04963bc79febeae1c5fbcbb1a995d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking(a)gmail.com>
Date: Fri, 14 Feb 2014 00:14:53 +0100
Subject: [PATCH 11/12] fix off-by-1 on multiscreen toppanel strutting
---
kwin/geometry.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kwin/geometry.cpp b/kwin/geometry.cpp
index 2e3f26f..63906aa 100644
--- a/kwin/geometry.cpp
+++ b/kwin/geometry.cpp
@@ -3011,7 +3011,7 @@ void Client::handleMoveResize(int x, int y, int x_root, int y_root)
foreach (const QRect &r, strut.rects()) {
if (r.top() == 0 && r.width() > r.height() && // "top panel"
r.intersects(moveResizeGeom) && moveResizeGeom.top() < r.bottom()) {
- newTitleTop = r.bottom();
+ newTitleTop = r.bottom() + 1;
break;
}
}
--
1.9.0
++++++ 0012-Perform-the-systemd-version-evaluation-through-a-reg.patch ++++++
>From 5dc2b9a5c09d95ba9a17ac00056213082feb8d90 Mon Sep 17 00:00:00 2001
From: Raymond Wooninck <tittiatcoke(a)gmail.com>
Date: Tue, 25 Feb 2014 19:59:36 +0100
Subject: [PATCH 12/12] Perform the systemd version evaluation through a
regular expression to be more flexible for changes in the version string that
systemd returns
REVIEW: 115271
---
.../daemon/backends/upower/powerdevilupowerbackend.cpp | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
index eae5436..94b20f1 100644
--- a/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
+++ b/powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
@@ -40,13 +40,17 @@
bool checkSystemdVersion(uint requiredVersion)
{
- bool ok;
QDBusInterface systemdIface("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager",
QDBusConnection::systemBus(), 0);
- const uint version = systemdIface.property("Version").toString().section(' ', 1).toUInt(&ok);
- if (ok) {
- return (version >= requiredVersion);
+
+ const QString reply = systemdIface.property("Version").toString();
+
+ QRegExp expsd("(systemd )?([0-9]+)");
+
+ if (expsd.exactMatch(reply)) {
+ const uint version = expsd.cap(2).toUInt();
+ return (version >= requiredVersion);
}
// Since version 1.11 Upstart user sessions implement the exact same API as logind
--
1.9.0
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package ghostscript-fonts-grops for openSUSE:Factory checked in at 2014-02-28 07:20:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghostscript-fonts-grops (Old)
and /work/SRC/openSUSE:Factory/.ghostscript-fonts-grops.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghostscript-fonts-grops"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghostscript-fonts-grops/ghostscript-fonts-grops.changes 2014-01-23 15:43:41.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ghostscript-fonts-grops.new/ghostscript-fonts-grops.changes 2014-02-28 07:20:38.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Feb 27 17:00:58 CET 2014 - tiwai(a)suse.de
+
+- add automatic installation for Polish locale (bnc#856842)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghostscript-fonts-grops.spec ++++++
--- /var/tmp/diff_new_pack.pqxlki/_old 2014-02-28 07:20:39.000000000 +0100
+++ /var/tmp/diff_new_pack.pqxlki/_new 2014-02-28 07:20:39.000000000 +0100
@@ -24,6 +24,7 @@
Summary: Ghostscript fonts imported to groff for use with grops
License: GPL-2.0
Group: Productivity/Publishing/Troff
+Provides: locale(groff:pl)
Source: gsalias.txt
Source1: zzz-groff-gs.sh
Source2: zzz-groff-gs.csh
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package bundle-lang-common for openSUSE:Factory checked in at 2014-02-28 07:18:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bundle-lang-common (Old)
and /work/SRC/openSUSE:Factory/.bundle-lang-common.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bundle-lang-common"
Changes:
--------
--- /work/SRC/openSUSE:Factory/bundle-lang-common/bundle-lang-common.changes 2013-12-22 19:30:52.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.bundle-lang-common.new/bundle-lang-common.changes 2014-02-28 07:18:32.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Feb 27 07:32:28 UTC 2014 - coolo(a)suse.com
+
+- update package list and set version to 13.2
+
+-------------------------------------------------------------------
bundle-lang-kde.changes: same change
bundle-lang-other.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bundle-lang-common.spec ++++++
++++ 693 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/bundle-lang-common/bundle-lang-common.spec
++++ and /work/SRC/openSUSE:Factory/.bundle-lang-common.new/bundle-lang-common.spec
++++++ bundle-lang-gnome.spec ++++++
--- /var/tmp/diff_new_pack.7Gyq2z/_old 2014-02-28 07:18:34.000000000 +0100
+++ /var/tmp/diff_new_pack.7Gyq2z/_new 2014-02-28 07:18:34.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package bundle-lang-gnome
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,6 @@
Name: bundle-lang-gnome
# @BREQUIRES@
BuildRequires: NetworkManager-gnome-lang
-BuildRequires: PackageKit-lang
BuildRequires: accountsservice-lang
BuildRequires: aisleriot-lang
BuildRequires: alacarte-lang
@@ -144,7 +143,7 @@
#!BuildIgnore: typelib-1_0-Vte-0_0
#!BuildIgnore: gimp-unstable
#!BuildIgnore: gnuchess
-Version: 13.1
+Version: 13.2
Release: 0
Summary: Translations for many GNOME programs
License: MIT
@@ -165,7 +164,6 @@
Summary: English translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -256,7 +254,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:en)
-Provides: locale(PackageKit:en)
Provides: locale(accountsservice:en)
Provides: locale(aisleriot:en)
Provides: locale(alacarte:en)
@@ -402,7 +399,6 @@
Summary: German translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -493,7 +489,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:de)
-Provides: locale(PackageKit:de)
Provides: locale(accountsservice:de)
Provides: locale(aisleriot:de)
Provides: locale(alacarte:de)
@@ -639,7 +634,6 @@
Summary: Spanish translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -730,7 +724,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:es)
-Provides: locale(PackageKit:es)
Provides: locale(accountsservice:es)
Provides: locale(aisleriot:es)
Provides: locale(alacarte:es)
@@ -876,7 +869,6 @@
Summary: Translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -967,7 +959,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:it)
-Provides: locale(PackageKit:it)
Provides: locale(accountsservice:it)
Provides: locale(aisleriot:it)
Provides: locale(alacarte:it)
@@ -1113,7 +1104,6 @@
Summary: French translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -1204,7 +1194,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:fr)
-Provides: locale(PackageKit:fr)
Provides: locale(accountsservice:fr)
Provides: locale(aisleriot:fr)
Provides: locale(alacarte:fr)
@@ -1350,7 +1339,6 @@
Summary: Translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -1441,7 +1429,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:ja)
-Provides: locale(PackageKit:ja)
Provides: locale(accountsservice:ja)
Provides: locale(aisleriot:ja)
Provides: locale(alacarte:ja)
@@ -1587,7 +1574,6 @@
Summary: Translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -1678,7 +1664,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:zh)
-Provides: locale(PackageKit:zh)
Provides: locale(accountsservice:zh)
Provides: locale(aisleriot:zh)
Provides: locale(alacarte:zh)
@@ -1824,7 +1809,6 @@
Summary: Translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -1915,7 +1899,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:nl)
-Provides: locale(PackageKit:nl)
Provides: locale(accountsservice:nl)
Provides: locale(aisleriot:nl)
Provides: locale(alacarte:nl)
@@ -2061,7 +2044,6 @@
Summary: Translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -2152,7 +2134,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:cs)
-Provides: locale(PackageKit:cs)
Provides: locale(accountsservice:cs)
Provides: locale(aisleriot:cs)
Provides: locale(alacarte:cs)
@@ -2298,7 +2279,6 @@
Summary: Portuguese translations for a many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -2390,8 +2370,6 @@
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:pt)
Provides: locale(NetworkManager-gnome:pt_BR)
-Provides: locale(PackageKit:pt)
-Provides: locale(PackageKit:pt_BR)
Provides: locale(accountsservice:pt)
Provides: locale(accountsservice:pt_BR)
Provides: locale(aisleriot:pt)
@@ -2650,7 +2628,6 @@
Summary: Translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -2741,7 +2718,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:pl)
-Provides: locale(PackageKit:pl)
Provides: locale(accountsservice:pl)
Provides: locale(aisleriot:pl)
Provides: locale(alacarte:pl)
@@ -2887,7 +2863,6 @@
Summary: Translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -2978,7 +2953,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:ca)
-Provides: locale(PackageKit:ca)
Provides: locale(accountsservice:ca)
Provides: locale(aisleriot:ca)
Provides: locale(alacarte:ca)
@@ -3124,7 +3098,6 @@
Summary: Translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -3215,7 +3188,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:ar)
-Provides: locale(PackageKit:ar)
Provides: locale(accountsservice:ar)
Provides: locale(aisleriot:ar)
Provides: locale(alacarte:ar)
@@ -3361,7 +3333,6 @@
Summary: Translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -3452,7 +3423,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:hu)
-Provides: locale(PackageKit:hu)
Provides: locale(accountsservice:hu)
Provides: locale(aisleriot:hu)
Provides: locale(alacarte:hu)
@@ -3598,7 +3568,6 @@
Summary: Translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -3689,7 +3658,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:ko)
-Provides: locale(PackageKit:ko)
Provides: locale(accountsservice:ko)
Provides: locale(aisleriot:ko)
Provides: locale(alacarte:ko)
@@ -3835,7 +3803,6 @@
Summary: Translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -3926,7 +3893,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:da)
-Provides: locale(PackageKit:da)
Provides: locale(accountsservice:da)
Provides: locale(aisleriot:da)
Provides: locale(alacarte:da)
@@ -4072,7 +4038,6 @@
Summary: Translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -4163,7 +4128,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:sv)
-Provides: locale(PackageKit:sv)
Provides: locale(accountsservice:sv)
Provides: locale(aisleriot:sv)
Provides: locale(alacarte:sv)
@@ -4309,7 +4273,6 @@
Summary: Translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -4400,7 +4363,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:ru)
-Provides: locale(PackageKit:ru)
Provides: locale(accountsservice:ru)
Provides: locale(aisleriot:ru)
Provides: locale(alacarte:ru)
@@ -4546,7 +4508,6 @@
Summary: Translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -4637,7 +4598,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:fi)
-Provides: locale(PackageKit:fi)
Provides: locale(accountsservice:fi)
Provides: locale(aisleriot:fi)
Provides: locale(alacarte:fi)
@@ -4783,7 +4743,6 @@
Summary: Translations for many GNOME programs
Group: System/Localization
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -4874,7 +4833,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:nb)
-Provides: locale(PackageKit:nb)
Provides: locale(accountsservice:nb)
Provides: locale(aisleriot:nb)
Provides: locale(alacarte:nb)
@@ -5020,7 +4978,6 @@
Summary: Translations for many GNOME programs
Group: group
Provides: NetworkManager-gnome-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-gnome-lang)
-Provides: PackageKit-lang = %(rpm -q --queryformat '%{VERSION}' PackageKit-lang)
Provides: accountsservice-lang = %(rpm -q --queryformat '%{VERSION}' accountsservice-lang)
Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang)
Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang)
@@ -5111,7 +5068,6 @@
Provides: liferea-lang = %(rpm -q --queryformat '%{VERSION}' liferea-lang)
Provides: lightsoff-lang = %(rpm -q --queryformat '%{VERSION}' lightsoff-lang)
Provides: locale(NetworkManager-gnome:el)
-Provides: locale(PackageKit:el)
Provides: locale(accountsservice:el)
Provides: locale(aisleriot:el)
Provides: locale(alacarte:el)
@@ -5375,7 +5331,6 @@
packages="$packages alacarte-lang"
packages="$packages aisleriot-lang"
packages="$packages accountsservice-lang"
-packages="$packages PackageKit-lang"
packages="$packages NetworkManager-gnome-lang"
bash %SOURCE0 $packages
@@ -5470,9 +5425,6 @@
done
done
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files en -f taken.en
%files de -f taken.de
++++++ bundle-lang-kde.spec ++++++
++++ 743 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/bundle-lang-common/bundle-lang-kde.spec
++++ and /work/SRC/openSUSE:Factory/.bundle-lang-common.new/bundle-lang-kde.spec
++++++ bundle-lang-other.spec ++++++
--- /var/tmp/diff_new_pack.7Gyq2z/_old 2014-02-28 07:18:34.000000000 +0100
+++ /var/tmp/diff_new_pack.7Gyq2z/_new 2014-02-28 07:18:34.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package bundle-lang-other
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: bundle-lang-other
-Version: 13.1
+Version: 13.2
Release: 0
Summary: Translations for languages not covered by one of the bundle-lang-*-* packages
License: MIT
@@ -39,8 +39,6 @@
This package collects translations for languages not covered by one of
the bundle-lang-*-* packages.
-
-
%prep
%build
@@ -48,9 +46,6 @@
%install
install -D -m 644 %{SOURCE0} $RPM_BUILD_ROOT%_docdir/%name/README
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
%_docdir/%name
++++++ bundle-lang.spec.in ++++++
--- /var/tmp/diff_new_pack.7Gyq2z/_old 2014-02-28 07:18:34.000000000 +0100
+++ /var/tmp/diff_new_pack.7Gyq2z/_new 2014-02-28 07:18:34.000000000 +0100
@@ -30,7 +30,7 @@
#!BuildIgnore: gnuchess
License: license
Group: group
-Version: 13.1
+Version: 13.2
Release: 1
Summary: summary
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -149,9 +149,6 @@
done
done
-%clean
-rm -rf $RPM_BUILD_ROOT
-
#LANGUAGE_FILES
%changelog
++++++ packages.txt ++++++
--- /var/tmp/diff_new_pack.7Gyq2z/_old 2014-02-28 07:18:34.000000000 +0100
+++ /var/tmp/diff_new_pack.7Gyq2z/_new 2014-02-28 07:18:34.000000000 +0100
@@ -5,7 +5,7 @@
NetworkManager-pptp-lang common
NetworkManager-strongswan-lang gnome-extras
NetworkManager-vpnc-lang common
-PackageKit-lang gnome
+PackageKit-lang common
accerciser-lang gnome-extras
accountsservice-lang gnome
aisleriot-lang gnome
@@ -16,6 +16,7 @@
anjuta-extras-lang gnome-extras
anjuta-lang gnome-extras
appdata-tools-lang gnome-extras
+apper-lang kde
arista-lang gnome-extras
at-spi-lang gnome-extras
at-spi2-core-lang gnome-extras
@@ -58,7 +59,7 @@
devhelp-lang gnome-extras
dia-lang gnome-extras
digikam-lang kde
-dirmngr-lang kde
+dirmngr-lang common
docky-lang gnome-extras
drwright-lang gnome-extras
easytag-lang gnome-extras
@@ -172,6 +173,7 @@
gnome-shell-extensions-common-lang gnome-extras
gnome-shell-lang gnome
gnome-software-lang gnome-extras
+gnome-sound-recorder-lang gnome-extras
gnome-subtitles-lang gnome-extras
gnome-sudoku-lang gnome
gnome-system-log-lang gnome-extras
@@ -237,7 +239,6 @@
gupnp-tools-lang gnome-extras
gvfs-lang gnome
gwget-lang gnome-extras
-gwibber-lang gnome-extras
hamster-time-tracker-lang gnome-extras
hitori-lang gnome-extras
homebank-lang gnome-extras
@@ -279,6 +280,7 @@
libgweather-lang gnome
libinfinity-lang gnome-extras
libiptcdata-lang gnome
+libkfbapi-lang kde
libkgeomap-lang kde
libktorrent5-lang kde
libosinfo-lang gnome
@@ -347,8 +349,11 @@
smuxi-engine-irc-lang gnome-extras
smuxi-engine-jabbr-lang gnome-extras
smuxi-engine-lang gnome-extras
+smuxi-engine-twitter-lang gnome-extras
+smuxi-engine-xmpp-lang gnome-extras
smuxi-frontend-gnome-irc-lang gnome-extras
smuxi-frontend-gnome-lang gnome-extras
+smuxi-frontend-gnome-twitter-lang gnome-extras
smuxi-frontend-gnome-xmpp-lang gnome-extras
smuxi-frontend-lang gnome-extras
smuxi-server-lang gnome-extras
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0