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
April 2015
- 1 participants
- 1958 discussions
Hello community,
here is the log from the commit of package calligra for openSUSE:Factory checked in at 2015-04-02 16:04:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/calligra (Old)
and /work/SRC/openSUSE:Factory/.calligra.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calligra"
Changes:
--------
--- /work/SRC/openSUSE:Factory/calligra/calligra.changes 2015-03-18 13:07:00.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.calligra.new/calligra.changes 2015-04-02 16:04:36.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Mar 30 21:18:50 UTC 2015 - asterios.dramis(a)gmail.com
+
+- Added new build requirement Vc-devel-static (for krita).
+
+-------------------------------------------------------------------
+Sat Mar 21 18:54:09 UTC 2015 - tittiatcoke(a)gmail.com
+
+- Remove soprano as a buildrequires.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ calligra.spec ++++++
--- /var/tmp/diff_new_pack.9MsOUI/_old 2015-04-02 16:04:38.000000000 +0200
+++ /var/tmp/diff_new_pack.9MsOUI/_new 2015-04-02 16:04:38.000000000 +0200
@@ -28,6 +28,9 @@
BuildRequires: OpenColorIO-devel
%endif
BuildRequires: OpenEXR-devel
+%if 0%{?suse_version} > 1320
+BuildRequires: Vc-devel-static
+%endif
BuildRequires: create-resources
BuildRequires: eigen3-devel
BuildRequires: fdupes
@@ -48,7 +51,6 @@
BuildRequires: libpqxx-devel
BuildRequires: libqca2-devel
BuildRequires: librcps-devel
-BuildRequires: libsoprano-devel
BuildRequires: libspnav-devel
BuildRequires: marble-devel
BuildRequires: mysql-devel
@@ -188,15 +190,19 @@
%{kde4_runtime_requires}
%description active
+Calligra interface tailored specifically for use with Plasma Active on tablet
+devices.
%package gemini
-Summary: Tablet UI
+Summary: Traditional Desktop and Touch Friendly Interface
License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
%{kde4_runtime_requires}
%description gemini
+A combination between a traditional desktop application and a touch friendly
+application for Calligra Words and Stage.
%package karbon
Summary: Vector Drawing Application
1
0
Hello community,
here is the log from the commit of package sopwith for openSUSE:Factory checked in at 2015-04-02 16:04:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sopwith (Old)
and /work/SRC/openSUSE:Factory/.sopwith.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sopwith"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sopwith/sopwith.changes 2012-08-04 13:28:41.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sopwith.new/sopwith.changes 2015-04-02 16:04:33.000000000 +0200
@@ -1,0 +2,87 @@
+Wed Mar 25 16:08:38 UTC 2015 - p.drouand(a)gmail.com
+
+- Update to version 1.8.4
+ * Updated man page (doc/sopwith.6) to match Debian's manual page.
+ * Bring Sopwith up to date with bug fixes provided by Fedora.
+ This should avoid crash on start-up problems and makes
+ compiling more robust.
+- Changes from version 1.8.3
+ * The function asynclos() in swasynio.c includes a parameter
+ which is never used. Calling functions do not bother passing
+ a parameter. To avoid undefined behaviour the definition of
+ aynclos() has been fixed. (bdo#748172)
+ * Updated manual page to provide current default keys and
+ mention the location of the custom keys file (~/.sopwith/keys)
+ * Removed stray object files from tarball.
+ * Added rule to makefile "tarball" which performs more
+ complete clean-up and makes tarball in parent directory.
+- Changes from version 1.8.2
+ * Added SDL_CFLAGS flag to src/Makefile to bring us
+ in line with FreeBSD patches.
+ * Updated copyright notice on help screen.
+ * Removed compiler optimiations to avoid crashes when game is
+ built using versions of GCC newer than 4.6.
+- Changes from version 1.8.1
+ * Corrected initialization error would would prevent sound
+ from playing at start-up.
+ * Updated documentation to include command line flags for
+ playing music (-p) and starting Sopwith in quiet mode (-q).
+- Changes from version 1.8.0
+ * Most distributions are moving to GTK-3, sopwith's legacy code uses
+ GTK-2. Dropping GTK support in favour of SDL.
+ * Modified configure script.
+ * Patched crash caused by failure to find a suitable video device.
+ * Modified src/sdl/video.c to add new check.
+ * Fixed configure warings related to datarootdir variable.
+- Changes from version 1.7.5
+ * Cleaned up code to avoid compile warnings. Sopwith now
+ builds cleanly using Clang 3.0 and GCC 4.6.
+ * Added custom keys option. Controls can be altered by
+ adjusting the values in the ~/.sopwith/keys file. On
+ Windows this file should be located in the user's profile
+ under "AppData/Local/.sopwith/keys".
+- Changes from version 1.7.4
+ * Added man page patch to update documentation.
+ * Added include statements in vid_vga.c and sdl/video.c to bring
+ us in line with Debian's patches.
+ * Applied patch to swasynio.c to correct spelling errors.
+ * Oil tank explosions should be a little more intense now. These
+ larger/faster explosions can be turned off at the command line
+ by using the "-e" flag. (bdo#188298.)
+- Changes from version 1.7.3
+ * Added range check patch to avoid crashes when plan or missile
+ is close to the edge of the map. (bdo#224518 and bdo#258751)
+ * Mouse pointer no longer appears over Sopwith window.
+ (bdo#187930)
+ * Depreciated gtk branch, updated configure/makefile scripts.
+ * Sound is now turned off by default. Sound can be turned on using
+ the -p flag from the command line.
+ * Fixed socket check in tcpcomm.c (error returns -1, not less than -2).
+ * When AI plane is chasing the player's plane, the AI plane will
+ now shoot if it is in position. (swauto.c)
+ * When the player's plane is damaged, the auto-pilot is less
+ manouverable, just like the player's controls. (swauto.c)
+ * Holding down the X or Z keys now causes the player's plane to
+ constantly speed up or slow down. Previously, the key had
+ to be rapidly tapped to change speed. (bdo#188301)
+ * Updated title screen to show exit message.
+ * Fixed compiler warning in swconf.c
+- Changes from version 1.7.2
+ * Cleaned up some compile errors from gcc 4.4.1 on Ubuntu.
+ (bdo#582399)
+ * Added -g command line option. -g and a number, such as -g2
+ will start the game on difficulty level 2. Normally the
+ game starts at zero. (bdo#582398)
+- Correct source Url
+- Remove fixed on upstream patches
+ * sopwith-gcc4.patch
+ * sopwith.6.patch
+ * sopwith-gtk-video.patch
+ * sopwith-sdl-video.patch
+ * sopwith-vid_vga.patch
+- Update sopwith-gpl.diff
+- Add sopwith-fix-string-include.patch
+- Remove gtk2-devel of require list; upstream has dropped gtk support
+- Remove redundant %clean section
+
+-------------------------------------------------------------------
Old:
----
sdl_sopwith-1.7.1.tar.gz
sopwith-gcc4.patch
sopwith-gtk-video.patch
sopwith-sdl-video.patch
sopwith-vid_vga.patch
sopwith.6.patch
New:
----
sopwith-1.8.4.tar.gz
sopwith-fix-string-include.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sopwith.spec ++++++
--- /var/tmp/diff_new_pack.Ge3BoM/_old 2015-04-02 16:04:33.000000000 +0200
+++ /var/tmp/diff_new_pack.Ge3BoM/_new 2015-04-02 16:04:33.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sopwith
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,26 +17,21 @@
Name: sopwith
-Version: 1.7.1
+Version: 1.8.4
Release: 0
-Summary: SDL port of the sopwith game
+Summary: SDL port of the %{name} game
License: GPL-2.0+
Group: Amusements/Games/Action/Arcade
Url: http://sdl-sopwith.sourceforge.net/
-Source0: http://downloads.sourceforge.net/sdl-sopwith/sdl_sopwith-%{version}.tar.gz
-#Source0: http://downloads.sourceforge.net/project/sdl-sopwith/sdl_sopwith/%{version}…
-Source1: sopwith.png
-Patch0: sopwith-gcc4.patch
-Patch1: sopwith.6.patch
-Patch2: sopwith-gtk-video.patch
-Patch3: sopwith-sdl-video.patch
-Patch4: sopwith-vid_vga.patch
-Patch5: sopwith-gpl.diff
+Source0: http://downloads.sourceforge.net/project/sdl-sopwith/sdl_%{name}/%{version}…
+Source1: %{name}.png
+Patch0: %{name}-fix-string-include.patch
+Patch5: %{name}-gpl.diff
BuildRequires: SDL-devel
BuildRequires: SDL_gfx-devel
BuildRequires: desktop-file-utils
-BuildRequires: gtk2-devel
+BuildRequires: hicolor-icon-theme
%description
This is a port of the classic computer game "Sopwith" to run on modern
@@ -44,32 +39,28 @@
%prep
-%setup -q -n sdl_sopwith-%{version}
+%setup -q
rm -f src/font.h
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%patch5 -p1
sed -i 's/\r//' doc/readme.txt
%build
-%configure
+%configure --docdir=%{_docdir}
make %{?_smp_mflags}
%install
make DESTDIR=$RPM_BUILD_ROOT install
-rm -rf $RPM_BUILD_ROOT%{_prefix}/share/doc/sopwith
+rm -rf $RPM_BUILD_ROOT%{_prefix}/share/doc/%{name}
cat > %{name}.desktop <<EOF
[Desktop Entry]
Name=Sopwith
Type=Application
-Comment=The classic sopwith game
-Exec=gtksopwith
+Comment=The classic %{name} game
+Exec=%{name}
Terminal=false
-Icon=sopwith
+Icon=%{name}
EOF
desktop-file-install --delete-original \
@@ -78,19 +69,15 @@
--add-category Game \
%{name}.desktop
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/72x72/apps/
+cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/72x72/apps/
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING FAQ NEWS README TODO doc/keys.txt doc/origdoc.txt doc/readme.txt
-%{_bindir}/sopwith
-%{_bindir}/gtksopwith
-%{_mandir}/man6/sopwith*
+%{_bindir}/%{name}
+%{_mandir}/man6/%{name}*
%{_datadir}/applications/*%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/icons/hicolor/
%changelog
++++++ sopwith-fix-string-include.patch ++++++
--- a/src/gtk/video.c 2014-11-17 22:24:44.000000000 +0100
+++ b/src/gtk/video.c 2015-03-25 16:48:15.646422118 +0100
@@ -39,7 +39,7 @@
#include "vid_vga.c"
-#include <string.>
+#include <string.h>
BOOL vid_fullscreen = FALSE;
BOOL vid_double_size = TRUE;
++++++ sopwith-gpl.diff ++++++
--- /var/tmp/diff_new_pack.Ge3BoM/_old 2015-04-02 16:04:34.000000000 +0200
+++ /var/tmp/diff_new_pack.Ge3BoM/_new 2015-04-02 16:04:34.000000000 +0200
@@ -11,7 +11,7 @@
#include "timer.h"
#include "video.h"
-@@ -49,7 +49,7 @@ static inline void drawchar(int x, int y
+@@ -49,7 +49,7 @@
if (c < 0 || c >= 256)
return;
1
0
Hello community,
here is the log from the commit of package nano for openSUSE:Factory checked in at 2015-04-02 16:04:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nano (Old)
and /work/SRC/openSUSE:Factory/.nano.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nano"
Changes:
--------
--- /work/SRC/openSUSE:Factory/nano/nano.changes 2015-03-27 09:40:41.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.nano.new/nano.changes 2015-04-02 16:04:29.000000000 +0200
@@ -1,0 +2,5 @@
+Sat Mar 28 11:05:03 UTC 2015 - mpluskal(a)suse.com
+
+- Add gpg signature
+
+-------------------------------------------------------------------
New:
----
nano-2.4.0.tar.gz.asc
nano.keyring
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nano.spec ++++++
--- /var/tmp/diff_new_pack.9h94FQ/_old 2015-04-02 16:04:29.000000000 +0200
+++ /var/tmp/diff_new_pack.9h94FQ/_new 2015-04-02 16:04:29.000000000 +0200
@@ -25,6 +25,8 @@
Group: Productivity/Editors/Other
Url: http://nano-editor.org/
Source0: http://nano-editor.org/dist/v%{_version}/%{name}-%{version}.tar.gz
+Source1: http://nano-editor.org/dist/v%{_version}/%{name}-%{version}.tar.gz.asc
+Source2: %{name}.keyring
BuildRequires: file-devel
BuildRequires: ncurses-devel
BuildRequires: pkg-config
1
0
Hello community,
here is the log from the commit of package perl-Tk-Clock for openSUSE:Factory checked in at 2015-04-02 16:04:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Tk-Clock (Old)
and /work/SRC/openSUSE:Factory/.perl-Tk-Clock.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Tk-Clock"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Tk-Clock/perl-Tk-Clock.changes 2013-08-23 11:07:21.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.perl-Tk-Clock.new/perl-Tk-Clock.changes 2015-04-02 16:04:28.000000000 +0200
@@ -1,0 +2,34 @@
+Fri Mar 27 14:35:07 UTC 2015 - stephan.barth(a)suse.com
+
+- update to version 0.39 from 0.36
+ Upstream changes:
+
+ 0.39
+ * Remove perl recommendation from META as it breaks cpan clients
+
+ 0.38
+ * Fix skip_all. require Test::More 0.88
+
+ 0.37
+ * Use 12:15 AM instead of 00:15 AM
+ * Upped Copyright to 2015
+
+-------------------------------------------------------------------
+Fri Sep 19 12:15:51 UTC 2014 - coolo(a)suse.com
+
+- updated to 0.36
+ * Fix locales for non-utf8 (and windows)
+ * Upped Copyright to 2014
+ * Make sure boolean attributes are 0 or 1
+ * Protect internal attributes from new and config calls
+ * Dynamically determine width of digital date and time
+
+-------------------------------------------------------------------
+Fri Oct 4 09:13:36 UTC 2013 - coolo(a)suse.com
+
+- updated to 0.35
+ * Indented SYNOPSIS (RT#85697 - Djibril Ousmanou)
+ * Support for locales in long day and month formats
+ * Support for local offset (in seconds)
+
+-------------------------------------------------------------------
Old:
----
Tk-Clock-0.34.tgz
New:
----
Tk-Clock-0.39.tgz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Tk-Clock.spec ++++++
--- /var/tmp/diff_new_pack.A7mSdm/_old 2015-04-02 16:04:28.000000000 +0200
+++ /var/tmp/diff_new_pack.A7mSdm/_new 2015-04-02 16:04:28.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-Tk-Clock
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -16,38 +16,32 @@
#
-%bcond_with test
-
Name: perl-Tk-Clock
-Version: 0.34
+Version: 0.39
Release: 0
%define cpan_name Tk-Clock
Summary: Clock widget with analog and digital display
-License: GPL-1.0+ or Artistic-1.0
+License: Artistic-1.0 or GPL-1.0+
Group: Development/Libraries/Perl
Url: http://search.cpan.org/dist/Tk-Clock/
-Source: http://www.cpan.org/authors/id/H/HM/HMBRAND/Tk-Clock-%{version}.tgz
+Source: http://www.cpan.org/authors/id/H/HM/HMBRAND/%{cpan_name}-%{version}.tgz
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
-BuildRequires: perl(ExtUtils::MakeMaker)
-%if %{with test}
-BuildRequires: perl(Test::Harness)
-BuildRequires: perl(Test::More)
BuildRequires: perl(Test::NoWarnings)
-%endif
-#
-BuildRequires: perl(Carp)
BuildRequires: perl(Tk) >= 402.000
BuildRequires: perl(Tk::Canvas)
BuildRequires: perl(Tk::Derived)
BuildRequires: perl(Tk::Widget)
-Requires: perl(Carp)
+Requires: perl(Test::NoWarnings)
Requires: perl(Tk) >= 402.000
Requires: perl(Tk::Canvas)
Requires: perl(Tk::Derived)
Requires: perl(Tk::Widget)
+Recommends: perl(Encode) >= 2.59
+Recommends: perl(Test::More) >= 1.001003
+Recommends: perl(Tk) >= 804.032
%{perl_requires}
%description
@@ -59,30 +53,19 @@
%prep
%setup -q -n %{cpan_name}-%{version}
find . -type f -print0 | xargs -0 chmod 644
-##rpmlint
-# wrong-script-interpreter
-%{__perl} -p -i -e 's|/pro/bin/perl|%{__perl}|' examples/*.pl
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}
-## skipping test
-# ....couldn't connect to display ":0"
-%if %{with test}
-
%check
%{__make} test
-%endif
%install
%perl_make_install
%perl_process_packlist
%perl_gen_filelist
-%clean
-%{__rm} -rf %{buildroot}
-
%files -f %{name}.files
%defattr(-,root,root,755)
%doc ChangeLog examples README
++++++ Tk-Clock-0.34.tgz -> Tk-Clock-0.39.tgz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tk-Clock-0.34/ChangeLog new/Tk-Clock-0.39/ChangeLog
--- old/Tk-Clock-0.34/ChangeLog 2013-05-28 13:35:07.000000000 +0200
+++ new/Tk-Clock-0.39/ChangeLog 2015-02-12 09:23:28.000000000 +0100
@@ -1,3 +1,26 @@
+0.39 - 12 Feb 2015, H.Merijn Brand
+ * Move repo to github
+ * Remove perl recommendation from META as it breaks cpan clients
+
+0.38 - 03 Jan 2015, H.Merijn Brand
+ * Fix skip_all. require Test::More 0.88
+
+0.37 - 02 Jan 2015, H.Merijn Brand
+ * Use 12:15 AM instead of 00:15 AM
+ * Upped Copyright to 2015
+
+0.36 - 10 Apr 2014, H.Merijn Brand
+ * Fix locales for non-utf8 (and windows)
+ * Upped Copyright to 2014
+ * Make sure boolean attributes are 0 or 1
+ * Protect internal attributes from new and config calls
+ * Dynamically determine width of digital date and time
+
+0.35 - 20 Aug 2013, H.Merijn Brand
+ * Indented SYNOPSIS (RT#85697 - Djibril Ousmanou)
+ * Support for locales in long day and month formats
+ * Support for local offset (in seconds)
+
0.34 - 28 May 2013, H.Merijn Brand
* Force update if time wound back (ntp, date command)
* Upped Copyright to 2013
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tk-Clock-0.34/Clock.pm new/Tk-Clock-0.39/Clock.pm
--- old/Tk-Clock-0.34/Clock.pm 2013-05-28 13:31:44.000000000 +0200
+++ new/Tk-Clock-0.39/Clock.pm 2015-01-03 11:53:59.000000000 +0100
@@ -5,7 +5,7 @@
use strict;
use warnings;
-our $VERSION = "0.34";
+our $VERSION = "0.39";
use Carp;
@@ -23,6 +23,7 @@
my %def_config = (
timeZone => "",
+ useLocale => "C",
backDrop => "",
useAnalog => 1,
@@ -41,6 +42,7 @@
ana24hour => 0,
countDown => 0,
timerValue => 0,
+ localOffset => 0,
useInfo => 0,
@@ -72,33 +74,101 @@
_anaSize => $ana_base, # Default size (height & width)
_digSize => 26, # Height
+ _digWdth => 72, # Width
);
+my %locale = (
+ C => {
+ month => [
+ # m mm mmm mmmm
+ [ "1", "01", "Jan", "January" ],
+ [ "2", "02", "Feb", "February" ],
+ [ "3", "03", "Mar", "March" ],
+ [ "4", "04", "Apr", "April" ],
+ [ "5", "05", "May", "May" ],
+ [ "6", "06", "Jun", "June" ],
+ [ "7", "07", "Jul", "July" ],
+ [ "8", "08", "Aug", "August" ],
+ [ "9", "09", "Sep", "September"],
+ [ "10", "10", "Oct", "October" ],
+ [ "11", "11", "Nov", "November" ],
+ [ "12", "12", "Dec", "December" ],
+ ],
+ day => [
+ # ddd dddd
+ [ "Sun", "Sunday" ],
+ [ "Mon", "Monday" ],
+ [ "Tue", "Tuesday" ],
+ [ "Wed", "Wednesday" ],
+ [ "Thu", "Thursday" ],
+ [ "Fri", "Friday" ],
+ [ "Sat", "Saturday" ],
+ ],
+ },
+ );
+
+sub _booleans
+{
+ my $data = shift;
+ $data->{$_} = !!$data->{$_} for qw(
+ ana24hour
+ autoScale
+ countDown
+ handCenter
+ useAnalog
+ useDigital
+ useInfo
+ useSecHand
+ );
+ } # _booleans
+
+sub _decode
+{
+ my $s = shift;
+ $s && $s =~ m{[\x80-\xff]} or return $s;
+ my $u = eval { Encode::decode ("UTF-8", $s, Encode::FB_CROAK) };
+ return ($@ ? $s : $u);
+ } # _decode
+
+sub _newLocale
+{
+ my $locale = shift or return $locale{C};
+
+ require POSIX;
+ require Encode;
+
+ my $curloc = POSIX::setlocale (&POSIX::LC_TIME, "") || "C";
+ my $newloc = POSIX::setlocale (&POSIX::LC_TIME, $locale) || "C";
+ $locale{$newloc} and return $locale{$newloc};
+
+ my $l = $locale{$locale} = {};
+ foreach my $m (0 .. 11) {
+ @{$l->{month}[$m]} = map { _decode ($_) }
+ $m + 1, $locale{C}{month}[$m][1],
+ POSIX::strftime ("%b", 0, 0, 0, 1, $m, 113),
+ POSIX::strftime ("%B", 0, 0, 0, 1, $m, 113);
+ }
+ foreach my $d (0 .. 6) {
+ @{$l->{day}[$d]} = map { _decode ($_) }
+ POSIX::strftime ("%a", 0, 0, 0, $d - 1, 0, 113),
+ POSIX::strftime ("%A", 0, 0, 0, $d - 1, 0, 113);
+ }
+
+ POSIX::setlocale (&POSIX::LC_TIME, $curloc);
+
+ return $l;
+ } # _newLocale
+
sub _month # (month, size)
-{ # m mm mmm mmmm
- [[ "1", "01", "Jan", "January" ],
- [ "2", "02", "Feb", "February" ],
- [ "3", "03", "Mar", "March" ],
- [ "4", "04", "Apr", "April" ],
- [ "5", "05", "May", "May" ],
- [ "6", "06", "Jun", "June" ],
- [ "7", "07", "Jul", "July" ],
- [ "8", "08", "Aug", "August" ],
- [ "9", "09", "Sep", "September" ],
- [ "10", "10", "Oct", "October" ],
- [ "11", "11", "Nov", "November" ],
- [ "12", "12", "Dec", "December" ]]->[$_[0]][$_[1]];
+{
+ my ($locale, $m, $l) = @_;
+ ($locale{$locale} || $locale{C})->{month}[$m][$l];
} # _month
sub _wday # (wday, size)
{
- [[ "Sun", "Sunday" ],
- [ "Mon", "Monday" ],
- [ "Tue", "Tuesday" ],
- [ "Wed", "Wednesday" ],
- [ "Thu", "Thursday" ],
- [ "Fri", "Friday" ],
- [ "Sat", "Saturday" ]]->[$_[0]][$_[1]];
+ my ($locale, $m, $l) = @_;
+ ($locale{$locale} || $locale{C})->{day}[$m][$l];
} # _wday
sub _min
@@ -149,7 +219,7 @@
my $hght = $data->{useAnalog} * $data->{_anaSize} +
$data->{useDigital} * $data->{_digSize} + 1;
my $wdth = _max ($data->{useAnalog} * $data->{_anaSize},
- $data->{useDigital} * 72);
+ $data->{useDigital} * $data->{_digWdth});
my $dim = "${wdth}x${hght}";
my $geo = $clock->parent->geometry;
my ($pw, $ph) = split m/\D/, $geo; # Cannot use ->cget here
@@ -200,8 +270,29 @@
my $clock = shift;
my $data = $clock->privateData;
+
+ # Dynamically determine the size of the digital display
+ my @t = localtime (time + $data->{localOffset});
+ my ($wd, $hd) = do {
+ my $s_date = $data->{fmtd}->(@t, 0, 0, 0);
+ $s_date =~ s/\b([0-9])\b/0$1/g; # prepare "d" running from 9 to 10
+ my $f = $clock->Label (-font => $data->{dateFont})->cget (-font);
+ my %fm = $clock->fontMetrics ($f);
+ ($clock->fontMeasure ($f, $s_date), $fm{"-linespace"} || 9);
+ };
+ my ($wt, $ht) = do {
+ my $s_time = $data->{fmtt}->(@t, 0, 0, 0);
+ $s_time =~ s/\b([0-9])\b/0$1/g; # prepare "h" running from 9 to 10
+ my $f = $clock->Label (-font => $data->{timeFont})->cget (-font);
+ my %fm = $clock->fontMetrics ($f);
+ ($clock->fontMeasure ($f, $s_time), $fm{"-linespace"} || 9);
+ };
+ my $w = _max (72, int (1.1 * _max ($wt, $wd)));
+ $data->{_digSize} = $hd + 4 + $ht + 4; # height of date + time
+ $data->{_digWdth} = $w;
+
my $wdth = _max ($data->{useAnalog} * $data->{_anaSize},
- $data->{useDigital} * 72);
+ $data->{useDigital} * $w);
my ($pad, $anchor) = (5, "s");
my ($x, $y) = ($wdth / 2, $data->{useAnalog} * $data->{_anaSize});
if ($data->{digiAlign} eq "left") {
@@ -210,14 +301,14 @@
elsif ($data->{digiAlign} eq "right") {
($anchor, $x) = ("se", $wdth - $pad);
}
- $clock->createText ($x, $y + $data->{_digSize},
+ $clock->createText ($x, $y + $ht + 4 + $hd,
-anchor => $anchor,
-width => ($wdth - 2 * $pad),
-font => $data->{dateFont},
-fill => $data->{dateColor},
-text => $data->{dateFormat},
-tags => "date");
- $clock->createText ($x, $y + 13,
+ $clock->createText ($x, $y + $ht + 2,
-anchor => $anchor,
-width => ($wdth - 2 * $pad),
-font => $data->{timeFont},
@@ -363,9 +454,11 @@
if (ref $args eq "HASH") {
foreach my $arg (keys %$args) {
(my $attr = $arg) =~ s/^-//;
+ $attr =~ m/^_/ and next; # Internal use only!
exists $data->{$attr} and $data->{$attr} = delete $args->{$arg};
}
}
+ _booleans ($data);
$clock->SUPER::Populate ($args);
@@ -392,6 +485,7 @@
useInfo => 99991,
tickFreq => 99992,
anaScale => 99995,
+ useLocale => 1,
);
sub config
@@ -414,14 +508,17 @@
}
my $data = $clock->privateData;
+ $attr_weight{$_} ||= unpack "s>", $_ for keys %def_config;
+
my $autoScale;
# sort, so the recreational attribute will be done last
foreach my $conf_spec (
map { $_->[0] }
sort { $a->[1] <=> $b->[1] }
- map { [ $_, $attr_weight{$_} || unpack "s>", $_ ] }
+ map { [ $_, $attr_weight{$_} ] }
keys %$conf) {
(my $attr = $conf_spec) =~ s/^-//;
+ $attr =~ m/^_/ and next; # Internal use only!
defined $def_config{$attr} && defined $data->{$attr} or next;
my $old = $data->{$attr};
$data->{$attr} = $conf->{$conf_spec};
@@ -447,6 +544,15 @@
elsif ($attr eq "timeFont") {
$clock->itemconfigure ("time", -font => $data->{timeFont});
}
+ elsif ($attr eq "infoColor") {
+ $clock->itemconfigure ("info", -fill => $data->{infoColor});
+ }
+ elsif ($attr eq "infoFont") {
+ $clock->itemconfigure ("info", -font => $data->{infoFont});
+ }
+ elsif ($attr eq "useLocale") {
+ $locale{$data->{useLocale}} or _newLocale ($data->{useLocale});
+ }
elsif ($attr eq "dateFormat" || $attr eq "timeFormat" || $attr eq "infoFormat") {
my %fmt = (
"S" => '%d', # 45
@@ -482,16 +588,17 @@
my @fmt = split m/\b($xfmt)\b/, $fmt;
my $args = "";
$fmt = "";
+ my $locale = $data->{useLocale} || "C";
foreach my $f (@fmt) {
if (defined $fmt{$f}) {
$fmt .= $fmt{$f};
if ($f =~ m/^m+$/) {
my $l = length ($f) - 1;
- $args .= ", Tk::Clock::_month (\$m, $l)";
+ $args .= ", Tk::Clock::_month (q{$locale}, \$m, $l)";
}
elsif ($f =~ m/^ddd+$/) {
my $l = length ($f) - 3;
- $args .= ", Tk::Clock::_wday (\$wd, $l)";
+ $args .= ", Tk::Clock::_wday (q{$locale}, \$wd, $l)";
}
else {
$args .= ', $' . substr ($f, 0, 1);
@@ -513,6 +620,8 @@
q[ my $w = $yd / 7 + 1; ],
q[ my $h = $H % 12; ],
q[ my $A = $H > 11 ? "PM" : "AM"; ],
+ # AM/PM users expect 12:15 AM instead of 00:15 AM
+ q[ $h ||= 12; ],
qq[ sprintf qq!$fmt!$args; ],
q[ } ];
}
@@ -606,6 +715,7 @@
}
}
}
+ _booleans ($data);
if (defined $autoScale) {
$data->{autoScale} = $autoScale;
if ($autoScale) {
@@ -629,7 +739,7 @@
my $data = $clock->privateData;
$data->{timeZone} and local $ENV{TZ} = $data->{timeZone};
- my $t = time;
+ my $t = time + $data->{localOffset};
$t == $data->{_time_} and return; # Same time, no update
$t < $data->{_time_} and # Time wound back (ntp or date command)
($data->{Clock_h}, $data->{Clock_m}, $data->{Clock_s}) = (-1, -1, -1);
@@ -658,8 +768,11 @@
unless ($t[2] == $data->{Clock_h}) {
$data->{Clock_h} = $t[2];
+ $data->{fmtd} ||= sub {
+ sprintf "%02d-%02d-%02d", $_[3], $_[4] + 1, $_[5] + 1900;
+ };
$data->{useDigital} and
- $clock->itemconfigure ("date", -text => &{$data->{fmtd}} (@t));
+ $clock->itemconfigure ("date", -text => $data->{fmtd}->(@t));
}
unless ($t[1] == $data->{Clock_m}) {
@@ -679,11 +792,13 @@
$data->{useSecHand} and
$clock->coords ("sec",
$clock->_where ($data->{Clock_s}, 34, $data->{_anaSize}));
+ $data->{fmti} ||= sub { sprintf "%02d:%02d:%02d", @_[2,1,0]; };
$data->{useInfo} and
- $clock->itemconfigure ("info", -text => &{$data->{fmti}} (@t));
+ $clock->itemconfigure ("info", -text => $data->{fmti}->(@t));
}
+ $data->{fmtt} ||= sub { sprintf "%02d:%02d:%02d", @_[2,1,0]; };
$data->{useDigital} and
- $clock->itemconfigure ("time", -text => &{$data->{fmtt}} (@t));
+ $clock->itemconfigure ("time", -text => $data->{fmtt}->(@t));
$data->{autoScale} and $clock->_resize_auto;
} # _run
@@ -698,43 +813,45 @@
=head1 SYNOPSIS
-use Tk
-use Tk::Clock;
-
-$clock = $parent->Clock (?-option => <value> ...?);
-
-$clock->config ( # These reflect the defaults
- timeZone => "",
- backDrop => "",
-
- useAnalog => 1,
- handColor => "Green4",
- secsColor => "Green2",
- tickColor => "Yellow4",
- tickFreq => 1,
- tickDiff => 0,
- useSecHand => 1,
- handCenter => 0,
- anaScale => 100,
- autoScale => 0,
- ana24hour => 0,
- countDown => 0,
- timerValue => 0,
+ use Tk
+ use Tk::Clock;
- useInfo => 0,
- infoColor => "#cfb53b",
- infoFormat => "HH:MM:SS",
- infoFont => "fixed 6",
+ $clock = $parent->Clock (?-option => <value> ...?);
- useDigital => 1,
- digiAlign => "center",
- timeFont => "fixed 6",
- timeColor => "Red4",
- timeFormat => "HH:MM:SS",
- dateFont => "fixed 6",
- dateColor => "Blue4",
- dateFormat => "dd-mm-yy",
- );
+ $clock->config ( # These reflect the defaults
+ timeZone => "",
+ useLocale => "C",
+ backDrop => "",
+
+ useAnalog => 1,
+ handColor => "Green4",
+ secsColor => "Green2",
+ tickColor => "Yellow4",
+ tickFreq => 1,
+ tickDiff => 0,
+ useSecHand => 1,
+ handCenter => 0,
+ anaScale => 100,
+ autoScale => 0,
+ ana24hour => 0,
+ countDown => 0,
+ timerValue => 0,
+ localOffset => 0,
+
+ useInfo => 0,
+ infoColor => "#cfb53b",
+ infoFormat => "HH:MM:SS",
+ infoFont => "fixed 6",
+
+ useDigital => 1,
+ digiAlign => "center",
+ timeFont => "fixed 6",
+ timeColor => "Red4",
+ timeFormat => "HH:MM:SS",
+ dateFont => "fixed 6",
+ dateColor => "Blue4",
+ dateFormat => "dd-mm-yy",
+ );
=head1 DESCRIPTION
@@ -832,6 +949,14 @@
the this value. When the time reaches 0, all countdown values are
reset to 0.
+=item localOffset (0)
+
+The value of this attribute represents the local offset for this clock
+in seconds. Negative is back in time, positive is in the future.
+
+ # Wind back clock 4 days, 5 hours, 6 minutes and 7 seconds
+ $clock->config (localOffset => -363967);
+
=item handColor ("Green4")
=item secsColor ("Green2")
@@ -886,6 +1011,18 @@
$clock->config (timeZone => "Europe/Amsterdam");
$clock->config (timeZone => "MET-1METDST");
+=item useLocale ("C")
+
+Use this locale for the text shown in month formats C<mmm> and C<mmmm> and in
+day formats C<ddd> and C<dddd>.
+
+ $clock->config (useLocale => $ENV{LC_TIME} // $ENV{LC_ALL}
+ // $ENV{LANG} // "nl_NL.utf8");
+
+See L<http://docs.moodle.org/dev/Table_of_locales> for a table of locales
+and the Windows equivalents. Windows might not have a UTF8 version available
+of the required locale.
+
=item timeFont ("fixed 6")
Controls the font to be used for the top line in the digital clock. Will
@@ -916,6 +1053,9 @@
$clock->config (timeFormat => "hh:MM A");
+The text shown in the formats C<ddd>, C<dddd>, C<mmm>, and C<mmmm> might be
+influenced by the setting of C<useLocale>. The fallback is locale "C".
+
=item dateFont ("fixed 6")
Controls the font to be used for the bottom line in the digital clock. Will
@@ -1012,8 +1152,6 @@
=head1 TODO
-* Using POSIX' strftime () for dateFormat. Current implementation
- would probably make this very slow.
* Full support for multi-line date- and time-formats with auto-resize.
* Countdown clock API, incl action when done.
* Better docs for the attributes
@@ -1036,7 +1174,7 @@
=head1 COPYRIGHT AND LICENSE
-Copyright (C) 1999-2013 H.Merijn Brand
+Copyright (C) 1999-2015 H.Merijn Brand
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tk-Clock-0.34/MANIFEST new/Tk-Clock-0.39/MANIFEST
--- old/Tk-Clock-0.34/MANIFEST 2013-05-29 09:19:11.000000000 +0200
+++ new/Tk-Clock-0.39/MANIFEST 2015-02-12 09:28:07.000000000 +0100
@@ -6,6 +6,7 @@
examples/24hour.pl
examples/cdclock.pl
examples/countdown.pl
+examples/random.pl
examples/simple.pl
examples/station.pl
examples/world.pl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tk-Clock-0.34/META.json new/Tk-Clock-0.39/META.json
--- old/Tk-Clock-0.34/META.json 2013-05-29 09:19:11.000000000 +0200
+++ new/Tk-Clock-0.39/META.json 2015-02-12 09:28:07.000000000 +0100
@@ -1,66 +1,66 @@
{
+ "resources" : {
+ "repository" : {
+ "type" : "git",
+ "web" : "https://github.com/Tux/Tk-Clock",
+ "url" : "https://github.com/Tux/Tk-Clock"
+ },
+ "license" : [
+ "http://dev.perl.org/licenses/"
+ ]
+ },
+ "dynamic_config" : 1,
"prereqs" : {
"runtime" : {
"recommends" : {
- "perl" : "5.016003",
- "Tk" : "804.031"
- },
+ "Tk" : "804.032",
+ "Encode" : "2.70"
+ },
"requires" : {
"Tk::Canvas" : "0",
"Tk::Derived" : "0",
- "Tk::Widget" : "0",
+ "perl" : "5.006",
"Tk" : "402.000",
+ "Encode" : "0",
"Carp" : "0",
- "perl" : "5.006"
- }
- },
- "test" : {
- "requires" : {
- "Test::Harness" : "0",
- "Test::More" : "0",
- "Test::NoWarnings" : "0"
- },
- "recommends" : {
- "Test::More" : "0.98",
- "Test::Harness" : "3.28"
- }
- },
+ "POSIX" : "0",
+ "Tk::Widget" : "0"
+ }
+ },
"configure" : {
"requires" : {
"ExtUtils::MakeMaker" : "0"
- }
}
},
- "generated_by" : "Author",
- "resources" : {
- "repository" : {
- "type" : "git",
- "web" : "http://repo.or.cz/w/Tk-Clock.git",
- "url" : "http://repo.or.cz/r/Tk-Clock.git"
+ "test" : {
+ "recommends" : {
+ "Test::More" : "1.001014"
},
- "license" : [
- "http://dev.perl.org/licenses/"
- ]
- },
+ "requires" : {
+ "Test::NoWarnings" : "0",
+ "Test::More" : "0.88"
+ }
+ }
+ },
"author" : [
"H.Merijn Brand <h.m.brand(a)xs4all.nl>"
- ],
- "provides" : {
- "Tk::Clock" : {
- "file" : "Clock.pm",
- "version" : "0.34"
- }
- },
- "abstract" : "Clock widget with analog and digital display",
- "name" : "Tk-Clock",
+ ],
+ "version" : "0.39",
"meta-spec" : {
"url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
"version" : "2"
- },
- "version" : "0.34",
+ },
+ "provides" : {
+ "Tk::Clock" : {
+ "version" : "0.39",
+ "file" : "Clock.pm"
+ }
+ },
"license" : [
"perl_5"
- ],
+ ],
"release_status" : "stable",
- "dynamic_config" : 1
- }
+ "generated_by" : "Author",
+ "abstract" : "Clock widget with analog and digital display",
+ "name" : "Tk-Clock"
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tk-Clock-0.34/META.yml new/Tk-Clock-0.39/META.yml
--- old/Tk-Clock-0.34/META.yml 2013-05-29 09:19:11.000000000 +0200
+++ new/Tk-Clock-0.39/META.yml 2015-02-12 09:28:07.000000000 +0100
@@ -5,7 +5,7 @@
configure_requires:
ExtUtils::MakeMaker: 0
dynamic_config: 1
-generated_by: Author, CPAN::Meta::Converter version 2.130880
+generated_by: Author, CPAN::Meta::Converter version 2.143240
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -14,16 +14,16 @@
provides:
Tk::Clock:
file: Clock.pm
- version: '0.34'
+ version: '0.39'
recommends:
- Test::Harness: '3.28'
- Test::More: '0.98'
- Tk: '804.031'
- perl: '5.016003'
+ Encode: '2.70'
+ Test::More: '1.001014'
+ Tk: '804.032'
requires:
Carp: 0
- Test::Harness: 0
- Test::More: 0
+ Encode: 0
+ POSIX: 0
+ Test::More: '0.88'
Test::NoWarnings: 0
Tk: '402.000'
Tk::Canvas: 0
@@ -32,5 +32,5 @@
perl: '5.006'
resources:
license: http://dev.perl.org/licenses/
- repository: http://repo.or.cz/r/Tk-Clock.git
-version: '0.34'
+ repository: https://github.com/Tux/Tk-Clock
+version: '0.39'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tk-Clock-0.34/Makefile.PL new/Tk-Clock-0.39/Makefile.PL
--- old/Tk-Clock-0.34/Makefile.PL 2013-02-13 09:30:55.000000000 +0100
+++ new/Tk-Clock-0.39/Makefile.PL 2015-02-12 09:23:28.000000000 +0100
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# Copyright PROCURA B.V. (c) 1999-2013 H.Merijn Brand
+# Copyright PROCURA B.V. (c) 1999-2015 H.Merijn Brand
require 5.006;
@@ -25,8 +25,10 @@
"Tk::Derived" => 0,
"Tk::Widget" => 0,
"Carp" => 0,
- "Test::More" => 0,
+ "Test::More" => 0.88,
"Test::NoWarnings" => 0,
+ "Encode" => 0,
+ "POSIX" => 0,
},
dist => { COMPRESS => "gzip -9f",
@@ -58,6 +60,13 @@
"test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')"
$(TEST_FILES) 3>valgrind.log
);
+
+ my $min_vsn = ($] >= 5.010 && -d "xt" && -d "sandbox" && ($ENV{AUTOMATED_TESTING} || 0) != 1)
+ ? join "\n" =>
+ 'test ::',
+ ' -@env TEST_FILES="xt/*.t" make -e test_dynamic',
+ ''
+ : "";
join "\n" =>
'cover test_cover:',
' ccache -C',
@@ -84,7 +93,8 @@
' -@mv -f $(DISTVNAME).tar.gz $(DISTVNAME).tgz',
' -(a)cpants_lint.pl $(DISTVNAME).tgz',
' -@rm -f Debian_CPANTS.txt',
- '';
+ '',
+ $min_vsn;
} # postamble
1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tk-Clock-0.34/README new/Tk-Clock-0.39/README
--- old/Tk-Clock-0.34/README 2013-01-01 22:22:43.000000000 +0100
+++ new/Tk-Clock-0.39/README 2015-02-12 09:01:17.000000000 +0100
@@ -12,21 +12,21 @@
ration, which makes it not Y2K compliant.
COPYING:
- Copyright (c) 1998-2013 H.Merijn Brand. All rights reserved.
+ Copyright (c) 1998-2015 H.Merijn Brand. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
Recent changes can be (re)viewed in the public GIT repository
- at http://repo.or.cz/w/Tk-Clock.git
+ at https://github.com/Tux/Tk-Clock
Feel free to clone your own copy:
- $ git clone http://repo.or.cz/r/Tk-Clock.git Tk-Clock
+ $ git clone https://github.com/Tux/Tk-Clock Tk-Clock
or get it as a tgz:
$ wget --output-document=Tk-Clock-git.tgz \
- 'http://repo.or.cz/w/Tk-Clock.git?a=snapshot;sf=tgz'
+ https://github.com/Tux/Tk-Clock/archive/master.tar.gz
PREREQUISITES
perl5 (probably 5.004.04 or better)
@@ -64,7 +64,7 @@
See ChangeLog
COPYRIGHT AND LICENSE
- Copyright (C) 1999-2013 H.Merijn Brand
+ Copyright (C) 1999-2015 H.Merijn Brand
This library is free software; you can redistribute it and/or modify
it under the same terms as Perl itself.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tk-Clock-0.34/examples/random.pl new/Tk-Clock-0.39/examples/random.pl
--- old/Tk-Clock-0.34/examples/random.pl 1970-01-01 01:00:00.000000000 +0100
+++ new/Tk-Clock-0.39/examples/random.pl 2013-08-20 12:50:12.000000000 +0200
@@ -0,0 +1,46 @@
+#!/pro/bin/perl
+
+use Tk;
+use Tk::Clock;
+
+my @bw = qw( Black White );
+
+use Getopt::Long qw(:config bundling nopermute);
+GetOptions (
+ "r|rev|wb|white-on-black" => sub { @bw = reverse @bw },
+ ) or die "usage: station.pl [--white-on-black]\n";
+
+my $m = MainWindow->new;
+
+$m->configure (
+ -foreground => $bw[0],
+ -background => $bw[1],
+ );
+
+my $c = $m->Clock (
+ -background => $bw[1],
+ -relief => "flat",
+ )->pack (
+ -anchor => "c",
+ -expand => 1,
+ -fill => "both",
+ -padx => "10",
+ -pady => "10",
+ );
+$c->config (
+ useDigital => 0,
+ useAnalog => 1,
+ secsColor => "Red",
+ handColor => $bw[0],
+ tickColor => $bw[0],
+ tickFreq => 1,
+ tickDiff => 1,
+ handCenter => 1,
+ anaScale => 500,
+ autoScale => 1,
+ );
+
+srand (time);
+$m->repeat (2500, sub { $c->config (localOffset => int rand 86400); });
+
+MainLoop;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tk-Clock-0.34/t/10_base.t new/Tk-Clock-0.39/t/10_base.t
--- old/Tk-Clock-0.34/t/10_base.t 2012-04-17 08:27:52.000000000 +0200
+++ new/Tk-Clock-0.39/t/10_base.t 2015-01-03 11:43:20.000000000 +0100
@@ -3,8 +3,8 @@
use strict;
use warnings;
-use Test::More tests => 23;
-use Test::NoWarnings;
+use Test::More;
+require Test::NoWarnings;
BEGIN {
use_ok ("Tk");
@@ -12,10 +12,25 @@
}
my ($delay, $period, $m, $c) = (0, $ENV{TK_TEST_LENGTH} || 5000);
-$m = eval { MainWindow->new (-title => "clock"); } or
- skip_all ("No valid Tk environment");
+unless ($m = eval { MainWindow->new (-title => "clock") }) {
+ diag ("No valid Tk environment");
+ done_testing;
+ exit 0;
+ }
ok ($c = $m->Clock (-background => "Black"), "Clock Widget");
+
+# Safe to use en_US.UTF-8, as the fallback is C and all values are the same
+foreach my $loc ("C", "en_US.UTF-8") {
+ is (Tk::Clock::_month ($loc, 0, 0), "1", "Month format m Jan in $loc");
+ is (Tk::Clock::_month ($loc, 2, 1), "03", "Month format mm Mar in $loc");
+ is (Tk::Clock::_month ($loc, 4, 2), "May", "Month format mmm May in $loc");
+ is (Tk::Clock::_month ($loc, 6, 3), "July", "Month format mmmm Jul in $loc");
+
+ is (Tk::Clock::_wday ($loc, 0, 0), "Sun", "Weekday format ddd Sun in $loc");
+ is (Tk::Clock::_wday ($loc, 2, 1), "Tuesday", "Weekday format dddd Tue in $loc");
+ }
+
like ($c->config (
tickColor => "Orange",
handColor => "Red",
@@ -59,9 +74,10 @@
ok ($c->config (
useAnalog => 1,
useInfo => 1,
- useDigital => 1,
+ useDigital => 4, # Should be normalized to 1
dateFormat => "m/d/y",
timeFormat => "hh:MM A",
+ _digSize => 800, # Should be ignored
), "Maroon4 AD m/d/y hh:MM A");
});
@@ -106,6 +122,9 @@
useAnalog => 0,
useInfo => 0,
useDigital => 1,
+ useLocale => ($^O eq "MSWin32" ? "Japanese_Japan.932" : "ja_JP.utf8"),
+ timeFont => "Helvetica 8",
+ dateFont => "Helvetica 8",
dateFormat => "dddd\nd mmm yyy",
timeFormat => "",
), "Purple4 aD dddd\\nd mmm yyy ''");
@@ -119,6 +138,8 @@
useInfo => 1,
useDigital => 0,
anaScale => 300,
+ timeFont => "Helvetica 12",
+ dateFont => "Helvetica 12",
infoFormat => "Tk-Clock",
), "Gray75 Ad scale 300");
});
@@ -159,6 +180,7 @@
$c->after ($delay, sub {
$c->configure (-background => "Black");
ok ($c->config ({
+ anaScale => 250,
useAnalog => 1,
useInfo => 0,
useDigital => 0,
@@ -168,17 +190,31 @@
handCenter => 1,
tickFreq => 1,
tickDiff => 1,
- anaScale => 250,
}), " Station clock: hand centers and tick width");
});
$delay += $period;
$c->after ($delay, sub {
+ $c->configure (-background => "Black");
+ ok ($c->config ({
+ useInfo => 1,
+ useDigital => 1,
+ anaScale => 300,
+ dateFormat => "dd-mm-yyyy",
+ timeFormat => "HH:MM:SS",
+ localOffset => -363967, # minus 4 days, 5 hours, 6 minutes and 7 seconds
+ }), " Station clock: Time offset -4'05:06:07");
+ });
+
+$delay += $period;
+$c->after ($delay, sub {
$c->destroy;
ok (!Exists ($c), "Destroy Clock");
$m->destroy;
ok (!Exists ($m), "Destroy Main");
- exit;
+
+ Test::NoWarnings::had_no_warnings ();
+ done_testing;
});
MainLoop;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tk-Clock-0.34/t/20_resize.t new/Tk-Clock-0.39/t/20_resize.t
--- old/Tk-Clock-0.34/t/20_resize.t 2012-04-17 08:29:17.000000000 +0200
+++ new/Tk-Clock-0.39/t/20_resize.t 2015-01-03 11:34:24.000000000 +0100
@@ -3,8 +3,8 @@
use strict;
use warnings;
-use Test::More tests => 8;
-use Test::NoWarnings;
+use Test::More;
+require Test::NoWarnings;
BEGIN {
use_ok ("Tk");
@@ -12,8 +12,11 @@
}
my ($delay, $m, $c) = ($ENV{TK_TEST_LENGTH} || 10000);
-$m = eval { MainWindow->new (-title => "clock"); } or
- skip_all ("No valid Tk environment");
+unless ($m = eval { MainWindow->new (-title => "clock") }) {
+ diag ("No valid Tk environment");
+ done_testing;
+ exit 0;
+ }
ok ($c = $m->Clock (-background => "Black"), "Clock Widget");
like ($c->config (
@@ -34,7 +37,9 @@
ok (!Exists ($c), "Destroy Clock");
$m->destroy;
ok (!Exists ($m), "Destroy Main");
- exit;
+
+ Test::NoWarnings::had_no_warnings ();
+ done_testing;
});
MainLoop;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tk-Clock-0.34/t/30_dual.t new/Tk-Clock-0.39/t/30_dual.t
--- old/Tk-Clock-0.34/t/30_dual.t 2012-04-17 08:30:14.000000000 +0200
+++ new/Tk-Clock-0.39/t/30_dual.t 2015-01-03 11:34:34.000000000 +0100
@@ -3,8 +3,8 @@
use strict;
use warnings;
-use Test::More tests => 20;
-use Test::NoWarnings;
+use Test::More;
+require Test::NoWarnings;
BEGIN {
use_ok ("Tk");
@@ -12,8 +12,11 @@
}
my ($delay, $period, $m, $c) = (0, $ENV{TK_TEST_LENGTH} || 5000);
-$m = eval { MainWindow->new (-title => "clock", -background => "Black"); } or
- skip_all ("No valid Tk environment");
+unless ($m = eval { MainWindow->new (-title => "clock", -background => "Black") }) {
+ diag ("No valid Tk environment");
+ done_testing;
+ exit 0;
+ }
my %defconfig = (
-background => "Black",
@@ -70,7 +73,8 @@
like ($c4->config (
anaScale => 200,
countDown => 1,
- infoFormat => "Tissot",
+ useLocale => ($^O eq "MSWin32" ? "Japanese_Japan.932" : "ja_JP.utf8"),
+ infoFormat => "ddd mmm",
handColor => "Yellow",
timeZone => "Asia/Tokyo",
dateFormat => "Asia/Tokyo",
@@ -88,7 +92,9 @@
ok (!Exists ($_), "Destroy Clock") for $c1, $c2, $c3, $c4;
$m->destroy;
ok (!Exists ($m), "Destroy Main");
- exit;
+
+ Test::NoWarnings::had_no_warnings ();
+ done_testing;
});
MainLoop;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Tk-Clock-0.34/t/40_backdrop.t new/Tk-Clock-0.39/t/40_backdrop.t
--- old/Tk-Clock-0.34/t/40_backdrop.t 2012-04-17 08:33:04.000000000 +0200
+++ new/Tk-Clock-0.39/t/40_backdrop.t 2015-01-03 11:48:33.000000000 +0100
@@ -3,45 +3,53 @@
use strict;
use warnings;
-use Test::More tests => 10;
-use Test::NoWarnings;
+use Test::More;
+require Test::NoWarnings;
BEGIN {
use_ok ("Tk");
- use_ok ("Tk::PNG");
use_ok ("Tk::Photo");
use_ok ("Tk::Clock");
}
-SKIP: {
- $Tk::PNG::VERSION or skip "Cannot load Tk::PNG", 7;
-
- my $delay = $ENV{TK_TEST_LENGTH} || 5000;
- my $m = eval { MainWindow->new (-title => "clock"); } or
- skip_all ("No valid Tk environment");
-
- ok (my $c = $m->Clock (-relief => "flat"), "base clock");
- ok (my $p1 = $m->Photo (-file => "t/eye.png"), "Photo 1");
- ok (my $p2 = $m->Photo (-file => "t/eye2.png"), "Photo 2");
- ok ($c->config (
- backDrop => $p1,
- timeFont => "{Liberation Mono} 11",
- dateFont => "{Liberation Mono} 11",
- timeFormat => " ",
- dateFormat => "ddd, dd mmm yyyy",
- dateColor => "Navy",
- handColor => "#ffe0e0",
- useSecHand => 0,
- tickColor => "Blue",
- tickDiff => 1,
- handCenter => 1,
- anaScale => 330,
- ), "config ()");
- ok ($c->pack, "pack");
+eval { require "Tk::PNG" };
+unless ($Tk::PNG::VERSION) {
+ diag "SKIP: cannot load Tk::PNG";
+ done_testing;
+ exit 0;
+ }
- $c->after ( $delay, sub { $c->config (backDrop => $p2) });
+my ($delay, $m) = $ENV{TK_TEST_LENGTH} || 5000;
+unless ($m = eval { MainWindow->new (-title => "clock") }) {
+ diag ("No valid Tk environment");
+ done_testing;
+ exit 0;
+ }
- $c->after (2 * $delay, sub { $_->destroy for $c, $m; exit; });
+ok (my $c = $m->Clock (-relief => "flat"), "base clock");
+ok (my $p1 = $m->Photo (-file => "t/eye.png"), "Photo 1");
+ok (my $p2 = $m->Photo (-file => "t/eye2.png"), "Photo 2");
+ok ($c->config (
+ backDrop => $p1,
+ timeFont => "{Liberation Mono} 11",
+ dateFont => "{Liberation Mono} 11",
+ timeFormat => " ",
+ dateFormat => "ddd, dd mmm yyyy",
+ dateColor => "Navy",
+ handColor => "#ffe0e0",
+ useSecHand => 0,
+ tickColor => "Blue",
+ tickDiff => 1,
+ handCenter => 1,
+ anaScale => 330,
+ ), "config ()");
+ok ($c->pack, "pack");
+
+$c->after ( $delay, sub { $c->config (backDrop => $p2) });
+
+$c->after (2 * $delay, sub { $_->destroy for $c, $m;
+ Test::NoWarnings::had_no_warnings ();
+ done_testing;
+ });
- MainLoop;
- }
+MainLoop;
1
0
Hello community,
here is the log from the commit of package perl-DBD-Pg for openSUSE:Factory checked in at 2015-04-02 16:04:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-DBD-Pg (Old)
and /work/SRC/openSUSE:Factory/.perl-DBD-Pg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-DBD-Pg"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-DBD-Pg/perl-DBD-Pg.changes 2015-01-26 16:47:22.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.perl-DBD-Pg.new/perl-DBD-Pg.changes 2015-04-02 16:04:27.000000000 +0200
@@ -1,0 +2,15 @@
+Wed Feb 18 09:36:47 UTC 2015 - stephan.barth(a)suse.com
+
+- Update to version 3.5.1 from 3.5.0
+ Upstream changes:
+ - Prevent core dump if the second argument to the quote() method
+ is anything but a hashref
+ - Better "support" for SQL_ASCII servers in the tests.
+ Allow env var DBDPG_TEST_ALWAYS_ENV to force use of DBI_DSN and DBI_USER
+ in tests.
+ - Fix client_encoding detection on pre-9.1 servers
+ - Fix operator existence check in tests on pre-8.3 servers
+ - Documentation fix
+ - Fix pg_switch_prepared database handle documentation
+
+-------------------------------------------------------------------
Old:
----
DBD-Pg-3.5.0.tar.gz
New:
----
DBD-Pg-3.5.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-DBD-Pg.spec ++++++
--- /var/tmp/diff_new_pack.gKYURI/_old 2015-04-02 16:04:27.000000000 +0200
+++ /var/tmp/diff_new_pack.gKYURI/_new 2015-04-02 16:04:27.000000000 +0200
@@ -21,7 +21,7 @@
Summary: PostgreSQL database driver for the DBI module
License: GPL-1.0+ or Artistic-1.0
Group: Development/Libraries/Perl
-Version: 3.5.0
+Version: 3.5.1
Release: 0
Url: http://search.cpan.org/dist/DBD-Pg/
Source: http://www.cpan.org/authors/id/T/TU/TURNSTEP/DBD-Pg-%{version}.tar.gz
++++++ DBD-Pg-3.5.0.tar.gz -> DBD-Pg-3.5.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/Changes new/DBD-Pg-3.5.1/Changes
--- old/DBD-Pg-3.5.0/Changes 2015-01-06 21:36:42.000000000 +0100
+++ new/DBD-Pg-3.5.1/Changes 2015-02-17 22:18:07.000000000 +0100
@@ -1,7 +1,30 @@
'GSM' is Greg Sabino Mullane, greg(a)turnstep.com
-Version 3.5.0 Released January 6, 2015
+Version 3.5.1 Released February 17, 2015 (git commit 6c3457ee20c19ae492d29c490af6800e7e6a0774)
+
+ - Prevent core dump if the second argument to the quote() method
+ is anything but a hashref
+ [Greg Sabino Mullane]
+ (CPAN bug #101980)
+
+ - Better "support" for SQL_ASCII servers in the tests.
+ Allow env var DBDPG_TEST_ALWAYS_ENV to force use of DBI_DSN and DBI_USER in tests.
+ [Greg Sabino Mullane]
+
+ - Fix client_encoding detection on pre-9.1 servers
+ [Dagfinn Ilmari Mannsåker]
+
+ - Fix operator existence check in tests on pre-8.3 servers
+ [Dagfinn Ilmari Mannsåker]
+
+ - Documentation fix
+ [Stuart A Johnston]
+
+ - Fix pg_switch_prepared database handle documentation
+ [Dagfinn Ilmari Mannsåker]
+
+Version 3.5.0 Released January 6, 2015 (git commit bb13d3306fd1c73fac1c0c8a330c14e6b8443942)
- Allow "placeholder escaping" by the use of a backslash directly before it, e.g.
"SELECT 1 FROM jsontable WHERE foo \\? ?"
@@ -20,7 +43,7 @@
- In tests, force the client_encoding to UTF8, skip tests that involve
characters not supported by the server_encoding
- [Dagfinn Ilmari Mannsåker <ilmari(a)ilmari.org>]
+ [Dagfinn Ilmari Mannsåker]
- Fix memory leak when selecting from arrays
[Dagfinn Ilmari Mannsåker, reported by Krystian Samp]
@@ -42,7 +65,7 @@
It's not documented or tested in DBI, but it used to work until
DBD::Pg 3.4.0, and the change broke DBIx::Class::Schema::Loader, which
uses type='%'.
- [Dagfinn Ilmari Mannsåker <ilmari(a)ilmari.org>]
+ [Dagfinn Ilmari Mannsåker]
Version 3.4.0 Released August 16, 2014 (git commit 7a5da12d84b4c2e9879f90fb6168f56c095071fa)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/META.yml new/DBD-Pg-3.5.1/META.yml
--- old/DBD-Pg-3.5.0/META.yml 2015-01-02 18:04:28.000000000 +0100
+++ new/DBD-Pg-3.5.1/META.yml 2015-02-17 22:16:45.000000000 +0100
@@ -1,6 +1,6 @@
--- #YAML:1.0
name : DBD-Pg
-version : 3.5.0
+version : 3.5.1
abstract : DBI PostgreSQL interface
author:
- Greg Sabino Mullane <greg(a)turnstep.com>
@@ -30,10 +30,10 @@
provides:
DBD::Pg:
file : Pg.pm
- version : 3.5.0
+ version : 3.5.1
Bundle::DBD::Pg:
file : lib/Bundle/DBD/Pg.pm
- version : 3.5.0
+ version : 3.5.1
keywords:
- Postgres
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/Makefile.PL new/DBD-Pg-3.5.1/Makefile.PL
--- old/DBD-Pg-3.5.0/Makefile.PL 2014-12-28 03:24:02.000000000 +0100
+++ new/DBD-Pg-3.5.1/Makefile.PL 2015-02-17 22:17:00.000000000 +0100
@@ -5,7 +5,7 @@
use 5.008001;
## No version.pm for this one, as the prereqs are not loaded yet.
-my $VERSION = '3.5.0';
+my $VERSION = '3.5.1';
## App::Info is stored inside t/lib
## Create a proper path so we can use it below
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/Pg.pm new/DBD-Pg-3.5.1/Pg.pm
--- old/DBD-Pg-3.5.0/Pg.pm 2015-01-06 17:11:10.000000000 +0100
+++ new/DBD-Pg-3.5.1/Pg.pm 2015-02-17 22:17:03.000000000 +0100
@@ -16,7 +16,7 @@
{
package DBD::Pg;
- use version; our $VERSION = qv('3.5.0');
+ use version; our $VERSION = qv('3.5.1');
use DBI ();
use DynaLoader ();
@@ -1676,7 +1676,7 @@
=head1 VERSION
-This documents version 3.5.0 of the DBD::Pg module
+This documents version 3.5.1 of the DBD::Pg module
=head1 DESCRIPTION
@@ -2445,7 +2445,7 @@
portable. Each question mark is internally replaced by a "dollar sign number" in the order
in which they appear in the query (important when using L</bind_param>).
-The method second type of placeholder is "dollar sign numbers". This is the method
+The second type of placeholder is "dollar sign numbers". This is the method
that Postgres uses internally and is overall probably the best method to use
if you do not need compatibility with other database systems. DBD::Pg, like
PostgreSQL, allows the same number to be used more than once in the query.
@@ -2738,7 +2738,7 @@
The C<ping> method determines if there is a working connection to an active
database server. It does this by sending a small query to the server, currently
-B<'DBD::Pg ping test v3.5.0'>. It returns 0 (false) if the connection is not valid,
+B<'DBD::Pg ping test v3.5.1'>. It returns 0 (false) if the connection is not valid,
otherwise it returns a positive number (true). The value returned indicates the
current state:
@@ -3117,8 +3117,8 @@
prepared statements (assuming all other requirements for them are met). The default value,
2, means that a prepared statement will be prepared and used the second and subsequent
time execute is called. To always use PQexecPrepared instead of PQexecParams, set
-pg_switch_prepared to 1. Setting it to 0 will force DBD::Pg to use PQexecPrepared always -
-this was the default behavior in versions older than 3.0.0.
+pg_switch_prepared to 1 (this was the default behavior in earlier versions).
+Setting pg_switch_prepared to 0 will force DBD::Pg to always use PQexecParams.
=head3 B<pg_placeholder_dollaronly> (boolean)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/Pg.xs new/DBD-Pg-3.5.1/Pg.xs
--- old/DBD-Pg-3.5.0/Pg.xs 2015-01-04 18:31:35.000000000 +0100
+++ new/DBD-Pg-3.5.1/Pg.xs 2015-02-06 21:46:56.000000000 +0100
@@ -252,6 +252,9 @@
}
else {
SV **svp;
+ /* Currently the type argument must be a hashref, so throw an exception if not */
+ if (!SvROK(type_sv) || SvTYPE(SvRV(type_sv)) != SVt_PVHV)
+ croak("Second argument to quote must be a hashref");
if ((svp = hv_fetch((HV*)SvRV(type_sv),"pg_type", 7, 0)) != NULL) {
type_info = pg_type_data(SvIV(*svp));
}
@@ -263,7 +266,10 @@
}
}
if (!type_info) {
- warn("Unknown type %" IVdf ", defaulting to UNKNOWN",SvIV(type_sv));
+ if (NULL == type_info)
+ warn("No type given, defaulting to UNKNOWN");
+ else
+ warn("Unknown type %" IVdf ", defaulting to UNKNOWN", SvIV(type_sv));
type_info = pg_type_data(PG_UNKNOWN);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/README new/DBD-Pg-3.5.1/README
--- old/DBD-Pg-3.5.0/README 2015-01-04 18:29:20.000000000 +0100
+++ new/DBD-Pg-3.5.1/README 2015-02-17 22:16:53.000000000 +0100
@@ -5,7 +5,7 @@
DESCRIPTION:
------------
-This is version 3.5.0 of DBD::Pg, the Perl interface to Postgres using DBI.
+This is version 3.5.1 of DBD::Pg, the Perl interface to Postgres using DBI.
The web site for this interface, and the latest version, can be found at:
http://search.cpan.org/dist/DBD-Pg/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/SIGNATURE new/DBD-Pg-3.5.1/SIGNATURE
--- old/DBD-Pg-3.5.0/SIGNATURE 2015-01-06 21:37:17.000000000 +0100
+++ new/DBD-Pg-3.5.1/SIGNATURE 2015-02-17 22:18:19.000000000 +0100
@@ -15,24 +15,24 @@
Hash: RIPEMD160
SHA1 6f4143600430e0bc949c17b05ac34844e5fb3ee4 .perlcriticrc
-SHA1 eefe4f4ef91721b392f67f1bbfe1e15d8f597355 Changes
+SHA1 7fd50009ca75ffa163778593b7e80d6df1d76390 Changes
SHA1 21bc5f3c797d4d5b72285198ffeb1e4e1f0a2902 LICENSES/artistic.txt
SHA1 06877624ea5c77efe3b7e39b0f909eda6e25a4ec LICENSES/gpl-2.0.txt
SHA1 9c2b33069c9ceb7cd57ea0aeb7b8de144ab75672 MANIFEST
SHA1 8d2857ee9a6326c08507d8552f86709dd068fbe5 MANIFEST.SKIP
-SHA1 cb54282e4ba29ba1e8324cb252d2eff977d42658 META.yml
-SHA1 d317d0e9eaa0a054759d95f9838e84ec9073b3ee Makefile.PL
+SHA1 51f67eaf226fbacb6481bdf1cd9ba2b1e60156bd META.yml
+SHA1 18a007634ef746e54755063a017dd05274c3ba1e Makefile.PL
SHA1 920964b687f475c0c89d208f7b0cf445cc75cfa5 Pg.h
-SHA1 13104b7e303a6db326c3a203b1ae86c82e6f6af0 Pg.pm
-SHA1 86349733b5e5ffed40f76bfe7222669ea927f7b4 Pg.xs
-SHA1 195eee13c6801f5a389ac482263f247598e94ed4 README
+SHA1 c80599daa9f4d7bc0c1ea69733da2be9ebd130ca Pg.pm
+SHA1 881347f6fd99e6327a7b752a9da49d2d245bcff6 Pg.xs
+SHA1 f4a18e8d7b65ec7fbb99c6b263f5e15b9e60b977 README
SHA1 0332ac652afae7e53181e075ca446b88b8631ac6 README.dev
SHA1 7e213bf90f513595b59c0a2c4ef94fea1592efcf README.win32
SHA1 d1d664776d39011f328c21bef989b937d5d5b1db TODO
-SHA1 3ccf29a9a4bc49e545f840d0b73d39605b029999 dbdimp.c
+SHA1 f026a43c85faa98115cecfa4cb3939249610d761 dbdimp.c
SHA1 277805794455057c0b8c843b1169ed121a92ae75 dbdimp.h
SHA1 6c33bcf138e577722283bef02fceb8cbce4d100d dbivport.h
-SHA1 c72557dad6ec615574d1604883588bb94e528c22 lib/Bundle/DBD/Pg.pm
+SHA1 48908ba26ca5d480c713932716ea31cc0e889d1e lib/Bundle/DBD/Pg.pm
SHA1 31be571044014a059db6e66f81e73b50a8abe086 quote.c
SHA1 931179894b8b48de407547a38ce0e034f75baaaa quote.h
SHA1 93aa7e8cae0a361d1e6163dea0281ebff41f3c5f t/00_signature.t
@@ -40,18 +40,18 @@
SHA1 1f50adea4f2c7a5110eca34dc8b6d5dc9d4121ed t/01connect.t
SHA1 42b566f777c15a3d07e41d4bca55be435349376c t/01constants.t
SHA1 428de15fda885a2834908679123f0a527ae345f2 t/02attribs.t
-SHA1 0cecadd1ce6a2086aa64c11724a3ab38b1a6efc9 t/03dbmethod.t
+SHA1 fe201e464695e9e0c521889e7aabb48f673024d8 t/03dbmethod.t
SHA1 4e16959f7f2e68667a42c86c3d35e8d317034b23 t/03smethod.t
SHA1 dd47bd1ac55072177a57f856daca98904939112c t/04misc.t
SHA1 9113f062bf144a5768e9e4e98a0f140f498caee1 t/06bytea.t
SHA1 c4c43b2229411c3850de0a9cb9bae8e5ccc7d822 t/07copy.t
SHA1 3da07722ec0801113b6624c5e2037043e48b9203 t/08async.t
SHA1 36a86f92ee4e573a05e6d21186dee2722cea23f7 t/09arrays.t
-SHA1 814a98c8151c931ceadff49aa642c569cb12f272 t/12placeholders.t
+SHA1 d844cdaa86209a4424ffabb562798138611c0b2b t/12placeholders.t
SHA1 81558ca5c783ea6792fd103444a04df615a8d127 t/20savepoints.t
-SHA1 5bf25a5fa3fe5e34389639f023c2fcc65a3f3c6d t/30unicode.t
+SHA1 e793893121498fd1317a2bc97336edbf405b18d6 t/30unicode.t
SHA1 1d2b40b3d8b4c19e98983b4b749d651b834ca5d0 t/99cleanup.t
-SHA1 e84e98957d2a70c879efb7e5b84a80c51e6054f6 t/dbdpg_test_setup.pl
+SHA1 dbe586c65d10a865565257e07aadc1bd708f7956 t/dbdpg_test_setup.pl
SHA1 0e196509e83b3ca603478d994a0837edd51b841d t/lib/App/Info.pm
SHA1 e02b0b5206c37280f9259e6a02839cbfc10be53f t/lib/App/Info/Handler.pm
SHA1 cc5d256a57f1fe0ddc587685a0cd64f812bb1ce9 t/lib/App/Info/Handler/Print.pm
@@ -66,7 +66,7 @@
SHA1 f07cd5ecaeb854c81ceb9206364979cf607e6546 win32.mak
-----BEGIN PGP SIGNATURE-----
-iEYEAREDAAYFAlSsR30ACgkQvJuQZxSWSshtowCgqDOJfPD2Yf67C6s2Ip1uayX4
-ZA4AoObdH2XypiL0gunoZqz6aE+aeEY7
-=ztMZ
+iEYEAREDAAYFAlTjsBsACgkQvJuQZxSWSshm2gCeNleZPlGqWsGQbAdLGs+r7xAS
+CuAAniw4aN/9Xi1rkGwbTx1hKoN2Biyn
+=jZjV
-----END PGP SIGNATURE-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/dbdimp.c new/DBD-Pg-3.5.1/dbdimp.c
--- old/DBD-Pg-3.5.0/dbdimp.c 2015-01-04 18:30:13.000000000 +0100
+++ new/DBD-Pg-3.5.1/dbdimp.c 2015-02-17 22:17:21.000000000 +0100
@@ -84,6 +84,7 @@
static PGTransactionStatusType pg_db_txn_status (pTHX_ imp_dbh_t *imp_dbh);
static int pg_db_start_txn (pTHX_ SV *dbh, imp_dbh_t *imp_dbh);
static int handle_old_async(pTHX_ SV * handle, imp_dbh_t * imp_dbh, const int asyncflag);
+static void pg_db_detect_client_encoding_utf8(pTHX_ imp_dbh_t *imp_dbh);
/* ================================================================== */
void dbd_init (dbistate_t *dbistate)
@@ -224,9 +225,7 @@
}
}
- imp_dbh->client_encoding_utf8 =
- (0 == strncmp(PQparameterStatus(imp_dbh->conn, "client_encoding"), "UTF8", 4))
- ? DBDPG_TRUE : DBDPG_FALSE;
+ pg_db_detect_client_encoding_utf8(aTHX_ imp_dbh);
/* If the client_encoding is UTF8, flip the utf8 flag until convinced otherwise */
imp_dbh->pg_utf8_flag = imp_dbh->client_encoding_utf8;
@@ -474,7 +473,7 @@
}
/* No matter what state we are in, send an empty query to the backend */
- result = PQexec(imp_dbh->conn, "/* DBD::Pg ping test v3.5.0 */");
+ result = PQexec(imp_dbh->conn, "/* DBD::Pg ping test v3.5.1 */");
if (NULL == result) {
/* Something very bad, usually indicating the backend is gone */
return -3;
@@ -928,9 +927,7 @@
}
/* Do The Right Thing */
else if (-1 == imp_dbh->pg_enable_utf8) {
- imp_dbh->client_encoding_utf8 =
- (0 == strncmp(PQparameterStatus(imp_dbh->conn, "client_encoding"), "UTF8", 4))
- ? DBDPG_TRUE : DBDPG_FALSE;
+ pg_db_detect_client_encoding_utf8(aTHX_ imp_dbh);
imp_dbh->pg_enable_utf8 = -1;
imp_dbh->pg_utf8_flag = imp_dbh->client_encoding_utf8;
}
@@ -1996,7 +1993,7 @@
*/
if ('\\' == oldch && imp_dbh->ph_escaped) {
/* copy the placeholder-like character but ignore the backslash */
- unsigned char *p = statement-2;
+ char *p = statement-2;
while(*p++) {
*(p-1) = *p;
}
@@ -2952,6 +2949,25 @@
return utf8 ? pg_upgraded_sv(aTHX_ input) : pg_downgraded_sv(aTHX_ input);
}
+static void pg_db_detect_client_encoding_utf8(pTHX_ imp_dbh_t *imp_dbh) {
+ char *clean_encoding;
+ int i, j;
+ const char * const client_encoding =
+ PQparameterStatus(imp_dbh->conn, "client_encoding");
+ STRLEN len = strlen(client_encoding);
+ Newx(clean_encoding, len + 1, char);
+ for (i = 0, j = 0; i < len; i++) {
+ const char c = toLOWER(client_encoding[i]);
+ if (isALPHA(c) || isDIGIT(c))
+ clean_encoding[j++] = c;
+ };
+ clean_encoding[j] = '\0';
+ imp_dbh->client_encoding_utf8 =
+ (strnEQ(clean_encoding, "utf8", 4) || strnEQ(clean_encoding, "unicode", 8))
+ ? DBDPG_TRUE : DBDPG_FALSE;
+ Safefree(clean_encoding);
+}
+
/* ================================================================== */
int pg_quickexec (SV * dbh, const char * sql, const int asyncflag)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/lib/Bundle/DBD/Pg.pm new/DBD-Pg-3.5.1/lib/Bundle/DBD/Pg.pm
--- old/DBD-Pg-3.5.0/lib/Bundle/DBD/Pg.pm 2014-12-28 03:23:27.000000000 +0100
+++ new/DBD-Pg-3.5.1/lib/Bundle/DBD/Pg.pm 2015-02-17 22:16:41.000000000 +0100
@@ -4,7 +4,7 @@
use strict;
use warnings;
-$VERSION = '3.5.0';
+$VERSION = '3.5.1';
1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/t/03dbmethod.t new/DBD-Pg-3.5.1/t/03dbmethod.t
--- old/DBD-Pg-3.5.0/t/03dbmethod.t 2015-01-06 16:54:42.000000000 +0100
+++ new/DBD-Pg-3.5.1/t/03dbmethod.t 2015-02-06 21:46:37.000000000 +0100
@@ -26,7 +26,7 @@
if (! $dbh) {
plan skip_all => 'Connection to database failed, cannot continue testing';
}
-plan tests => 559;
+plan tests => 562;
isnt ($dbh, undef, 'Connect to database for database handle method testing');
@@ -1314,6 +1314,24 @@
# Test various quote types
#
+## Invalid type arguments
+$t='DB handle method "quote" throws exception on non-reference type argument';
+eval { $dbh->quote('abc', 'def'); };
+like ($@, qr{hashref}, $t);
+
+$t='DB handle method "quote" throws exception on arrayref type argument';
+eval { $dbh->quote('abc', ['arraytest']); };
+like ($@, qr{hashref}, $t);
+
+SKIP: {
+ eval { require Test::Warn; };
+ if ($@) {
+ skip ('Need Test::Warn for some tests', 1);
+ }
+
+ $t='DB handle method "quote" allows an empty hashref';
+ Test::Warn::warning_like ( sub { $dbh->quote('abc', {}); }, qr/UNKNOWN/, $t);
+}
## Points
$t='DB handle method "quote" works with type PG_POINT';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/t/12placeholders.t new/DBD-Pg-3.5.1/t/12placeholders.t
--- old/DBD-Pg-3.5.0/t/12placeholders.t 2015-01-06 17:55:42.000000000 +0100
+++ new/DBD-Pg-3.5.1/t/12placeholders.t 2015-02-08 19:08:06.000000000 +0100
@@ -657,9 +657,13 @@
SKIP: {
my $server_encoding = $dbh->selectrow_array('SHOW server_encoding');
+ my $client_encoding = $dbh->selectrow_array('SHOW client_encoding');
skip "Cannot test non-ascii dollar quotes with server_encoding='$server_encoding' (need UTF8 or SQL_ASCII)", 3,
unless $server_encoding =~ /\A(?:UTF8|SQL_ASCII)\z/;
+ skip 'Cannot test non-ascii dollar quotes unless client_encoding is UTF8', 3
+ if $client_encoding ne 'UTF8';
+
for my $ident (qq{\x{5317}}, qq{abc\x{5317}}, qq{_cde\x{5317}}) { ## hi-bit chars
eval {
$sth = $dbh->prepare(qq{SELECT \$$ident\$ 123 \$$ident\$});
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/t/30unicode.t new/DBD-Pg-3.5.1/t/30unicode.t
--- old/DBD-Pg-3.5.0/t/30unicode.t 2015-01-06 17:02:20.000000000 +0100
+++ new/DBD-Pg-3.5.1/t/30unicode.t 2015-02-08 19:06:19.000000000 +0100
@@ -27,6 +27,7 @@
my @tests;
my $server_encoding = $dbh->selectrow_array('SHOW server_encoding');
+my $client_encoding = $dbh->selectrow_array('SHOW client_encoding');
# Beware, characters used for testing need to be known to Unicode version 4.0.0,
# which is what perl 5.8.1 shipped with.
@@ -90,6 +91,10 @@
) {
skip "Can't do $range tests with server_encoding='$server_encoding'", 1
if $range !~ ($ranges{$server_encoding} || qr/\A(?:ascii)\z/);
+
+ skip 'Cannot perform range tests if client_encoding is not UTF8', 1
+ if $client_encoding ne 'UTF8';
+
foreach my $enable_utf8 (1, 0, -1) {
my $desc = "$state $range UTF-8 $test->{qtype} $type (pg_enable_utf8=$enable_utf8)";
my @args = @{$test->{args} || []};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/DBD-Pg-3.5.0/t/dbdpg_test_setup.pl new/DBD-Pg-3.5.1/t/dbdpg_test_setup.pl
--- old/DBD-Pg-3.5.0/t/dbdpg_test_setup.pl 2015-01-06 17:51:49.000000000 +0100
+++ new/DBD-Pg-3.5.1/t/dbdpg_test_setup.pl 2015-02-07 20:59:02.000000000 +0100
@@ -787,6 +787,12 @@
$testdir = "$dir/dbdpg_test_database";
}
+ ## Allow forcing of ENV variables
+ if ($ENV{DBDPG_TEST_ALWAYS_ENV}) {
+ $testdsn = $ENV{DBI_DSN} || '';
+ $testuser = $ENV{DBI_USER} || '';
+ }
+
return $testdsn, $testuser, $helpconnect, $su, $uid, $testdir, $pg_ctl, $initdb, $error, $version;
} ## end of get_test_settings
@@ -823,7 +829,7 @@
my $schema = 'dbd_pg_testschema';
my $SQL = 'SELECT 1 FROM pg_operator o, pg_namespace n '.
- 'WHERE oprname=? AND oprleft::regtype::text = ? AND oprright::regtype::text = ?'.
+ 'WHERE oprname=? AND oprleft = ?::regtype AND oprright = ?::regtype'.
' AND o.oprnamespace = n.oid AND n.nspname = ?';
my $sth = $dbh->prepare_cached($SQL);
my $count = $sth->execute($opname,$leftarg,$rightarg,$schema);
@@ -901,7 +907,6 @@
## Remove the test directory entirely
return if $ENV{DBDPG_TESTINITDB};
return if ! eval { require File::Path; 1; };
- warn "Removing test database directory\n";
File::Path::rmtree($testdir);
return;
1
0
Hello community,
here is the log from the commit of package tcpflow for openSUSE:Factory checked in at 2015-04-02 16:04:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tcpflow (Old)
and /work/SRC/openSUSE:Factory/.tcpflow.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tcpflow"
Changes:
--------
--- /work/SRC/openSUSE:Factory/tcpflow/tcpflow.changes 2012-08-27 17:47:27.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.tcpflow.new/tcpflow.changes 2015-04-02 16:04:26.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Mar 31 18:06:09 UTC 2015 - p.drouand(a)gmail.com
+
+- Update to version 1.4.4
+ * The ChangeLog/NEWS file has not been updated for this release
+- Use the download Url provided by upstream
+- Add openssl-devel and boost-devel build require; new upstream dependency
+
+-------------------------------------------------------------------
Old:
----
tcpflow-1.3.0.tar.gz
New:
----
tcpflow-1.4.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tcpflow.spec ++++++
--- /var/tmp/diff_new_pack.bZXRC9/_old 2015-04-02 16:04:26.000000000 +0200
+++ /var/tmp/diff_new_pack.bZXRC9/_new 2015-04-02 16:04:26.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package tcpflow
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 Sebastien Braun.
#
# All modifications and additions to the file contributed by third parties
@@ -18,16 +18,18 @@
Name: tcpflow
-Version: 1.3.0
+Version: 1.4.4
Release: 0
Summary: Reconstruct TCP streams from captured packets
License: GPL-3.0+
Group: Productivity/Networking/Diagnostic
Url: http://afflib.org/software/tcpflow
-Source: https://github.com/downloads/simsong/tcpflow/tcpflow-1.3.0.tar.gz
+Source: http://www.digitalcorpora.org/downloads/tcpflow/%{name}-%{version}.tar.gz
+BuildRequires: boost-devel
BuildRequires: gcc-c++
BuildRequires: libpcap-devel
+BuildRequires: openssl-devel
%description
tcpflow is a program that captures data transmitted as part of TCP connections
@@ -40,7 +42,7 @@
%setup -q
%build
-%configure --prefix=%{_prefix} --mandir=%{_mandir}
+%configure
make %{?_smp_mflags}
%install
++++++ tcpflow-1.3.0.tar.gz -> tcpflow-1.4.4.tar.gz ++++++
++++ 45620 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package sfml for openSUSE:Factory checked in at 2015-04-02 16:04:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sfml (Old)
and /work/SRC/openSUSE:Factory/.sfml.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sfml"
Changes:
--------
--- /work/SRC/openSUSE:Factory/sfml/sfml.changes 2013-04-23 15:20:42.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.sfml.new/sfml.changes 2015-04-02 16:04:24.000000000 +0200
@@ -1,0 +2,25 @@
+Wed Apr 1 13:42:34 UTC 2015 - meissner(a)suse.com
+
+- fixed -devel requires
+
+-------------------------------------------------------------------
+Mon Mar 23 03:31:09 UTC 2015 - p.drouand(a)gmail.com
+
+- Update to version 2.2
+ * A lot of things to list; please go to
+ http://www.sfml-dev.org/changelog.php#sfml-2.2
+- Remove obsolete patches
+ * sfml-1.6-nochm.patch
+ * sfml-1.6-cflags.patch
+ * sfml-1.6-gcc.patch
+ * sfml-1.6-system_libs.patch
+ * sfml-1.6-underlinking.patch
+ * sfml-1.6-png.patch
+ * sfml-memcpy.patch
+- Use download Url as source
+- Add unzip build require
+- Upstream moved to cmake
+ * Add cmake build require
+ * Use %cmake macro
+
+-------------------------------------------------------------------
Old:
----
sfml-1.6-cflags.patch
sfml-1.6-gcc.patch
sfml-1.6-nochm.patch
sfml-1.6-png.patch
sfml-1.6-system_libs.patch
sfml-1.6-underlinking.patch
sfml-1.6.tar.gz
sfml-memcpy.patch
New:
----
SFML-2.2-sources.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sfml.spec ++++++
--- /var/tmp/diff_new_pack.8MwOnR/_old 2015-04-02 16:04:25.000000000 +0200
+++ /var/tmp/diff_new_pack.8MwOnR/_new 2015-04-02 16:04:25.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sfml
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,30 +16,17 @@
#
-%define soname 1_6
+%define soname 2_2
Name: sfml
-Version: 1.6
+Version: 2.2
Release: 0
Summary: Simple and Fast Multimedia Library
License: Zlib and SUSE-Public-Domain
Group: Development/Libraries/C and C++
Url: http://www.sfml-dev.org/
-Source: sfml-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM
-Patch0: sfml-1.6-nochm.patch
-# PATCH-FIX-UPSTREAM
-Patch1: sfml-1.6-cflags.patch
-# PATCH-FIX-UPSTREAM
-Patch2: sfml-1.6-gcc.patch
-# PATCH-FIX-UPSTREAM
-Patch3: sfml-1.6-system_libs.patch
-# PATCH-FIX-UPSTREAM
-Patch4: sfml-1.6-underlinking.patch
-# PATCH-FIX-UPSTREAM
-Patch5: sfml-1.6-png.patch
-# PATCH-FIX-UPSTREAM
-Patch6: sfml-memcpy.patch
+Source: http://www.sfml-dev.org/files/SFML-%{version}-sources.zip
BuildRequires: Mesa-devel
+BuildRequires: cmake
BuildRequires: doxygen
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
@@ -56,6 +43,7 @@
BuildRequires: libsndfile-devel
BuildRequires: libtool
BuildRequires: openal-soft-devel
+BuildRequires: unzip
BuildRequires: xorg-x11-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -81,27 +69,13 @@
Summary: SFML development files
Group: Development/Libraries/C and C++
Requires: Mesa-devel
-Requires: libsfml1_6 = %{version}
+Requires: lib%{name}%{soname} = %{version}
%description devel
Development files for SFML.
%prep
-%setup -q -n sfml-%{version}
-%patch0
-%patch1
-%patch2
-%patch3
-%patch4
-%patch5 -p1
-%patch6 -p1
-
-rm -rf src/SFML/Graphics/GLEW
-rm -rf src/SFML/Graphics/libjpeg
-rm -rf src/SFML/Graphics/libpng
-rm -rf src/SFML/Graphics/SOIL
-rm -rf src/SFML/Graphics/zlib
-rm -rf src/SFML/Window/glext
+%setup -q -n SFML-%{version}
# fix line endings
find . -type f -not \( -name \*.gif -o -name \*.jpg -o -name \*.png -o -name \*.ttf -o -name \*.wav \) -exec sed -i "s|\r||" {} \;
@@ -110,12 +84,15 @@
find . -type f -exec chmod -x {} \;
%build
-make %{?_smp_mflags} DEBUGFLAGS="%{optflags} -DNDEBUG"
-cd doc/build
-doxygen
+%cmake -DSFML_BUILD_DOC=ON
+make %{?_smp_mflags}
%install
-make DESTDIR=%{buildroot}/usr DESTLIBDIR=%{buildroot}%{_libdir} install
+#make DESTDIR=%{buildroot}/usr DESTLIBDIR=%{buildroot}%{_libdir} install
+cd build
+%make_install
+# Remove documentation installed in wrong directory
+rm -rf %{buildroot}%{_datadir}/SFML
%post -n lib%{name}%{soname} -p /sbin/ldconfig
%postun -n lib%{name}%{soname} -p /sbin/ldconfig
@@ -127,7 +104,7 @@
%files devel
%defattr(-,root,root)
-%doc doc/*.htm doc/html
+%doc build/doc/html/*
%{_includedir}/SFML
%{_libdir}/lib*.so
1
0
Hello community,
here is the log from the commit of package mbedtls for openSUSE:Factory checked in at 2015-04-02 16:04:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mbedtls (Old)
and /work/SRC/openSUSE:Factory/.mbedtls.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mbedtls"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mbedtls/mbedtls.changes 2015-03-30 19:33:02.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mbedtls.new/mbedtls.changes 2015-04-02 16:04:22.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 1 11:05:55 UTC 2015 - schwab(a)suse.de
+
+- getrandom-syscall-fallback.patch: Fall back to /dev/urandom if getrandom
+ syscall is not implemented.
+
+-------------------------------------------------------------------
New:
----
getrandom-syscall-fallback.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mbedtls.spec ++++++
--- /var/tmp/diff_new_pack.9Xhj0c/_old 2015-04-02 16:04:23.000000000 +0200
+++ /var/tmp/diff_new_pack.9Xhj0c/_new 2015-04-02 16:04:23.000000000 +0200
@@ -25,6 +25,7 @@
Group: Development/Libraries/C and C++
Url: https://tls.mbed.org
Source: https://tls.mbed.org/download/%{name}-%{version}-gpl.tgz
+Patch: getrandom-syscall-fallback.patch
BuildRequires: cmake
BuildRequires: pkg-config
BuildRequires: zlib-devel
@@ -54,6 +55,7 @@
%prep
%setup -q
+%patch -p1
sed -i 's|//\(#define POLARSSL_THREADING_C\)|\1|' include/polarssl/config.h
sed -i 's|//\(#define POLARSSL_THREADING_PTHREAD\)|\1|' include/polarssl/config.h
++++++ getrandom-syscall-fallback.patch ++++++
Index: mbedtls-1.3.10/library/entropy_poll.c
===================================================================
--- mbedtls-1.3.10.orig/library/entropy_poll.c
+++ mbedtls-1.3.10/library/entropy_poll.c
@@ -81,40 +81,35 @@ int platform_entropy_poll( void *data, u
#include <sys/syscall.h>
#if defined(SYS_getrandom)
#define HAVE_GETRANDOM
-static int getrandom_wrapper( void *buf, size_t buflen, unsigned int flags )
+static ssize_t getrandom_wrapper( void *buf, size_t buflen, unsigned int flags )
{
return( syscall( SYS_getrandom, buf, buflen, flags ) );
}
#endif /* SYS_getrandom */
#endif /* __linux__ */
-#if defined(HAVE_GETRANDOM)
-
+#include <stdio.h>
#include <errno.h>
int platform_entropy_poll( void *data,
unsigned char *output, size_t len, size_t *olen )
{
- int ret;
+ FILE *file;
+ size_t ret;
((void) data);
- if( ( ret = getrandom_wrapper( output, len, 0 ) ) < 0 )
- return( POLARSSL_ERR_ENTROPY_SOURCE_FAILED );
-
- *olen = ret;
- return( 0 );
-}
-
-#else /* HAVE_GETRANDOM */
+#if defined(HAVE_GETRANDOM)
+ ssize_t sysret;
-#include <stdio.h>
+ if( ( sysret = getrandom_wrapper( output, len, 0 ) ) >= 0 )
+ {
+ *olen = sysret;
+ return( 0 );
+ }
+ if (sysret < 0 && errno != ENOSYS)
+ return( POLARSSL_ERR_ENTROPY_SOURCE_FAILED );
-int platform_entropy_poll( void *data,
- unsigned char *output, size_t len, size_t *olen )
-{
- FILE *file;
- size_t ret;
- ((void) data);
+#endif /* HAVE_GETRANDOM */
*olen = 0;
@@ -134,7 +129,6 @@ int platform_entropy_poll( void *data,
return( 0 );
}
-#endif /* HAVE_GETRANDOM */
#endif /* _WIN32 && !EFIX64 && !EFI32 */
#endif /* !POLARSSL_NO_PLATFORM_ENTROPY */
1
0
Hello community,
here is the log from the commit of package xulrunner for openSUSE:Factory checked in at 2015-04-02 16:04:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xulrunner (Old)
and /work/SRC/openSUSE:Factory/.xulrunner.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xulrunner"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xulrunner/xulrunner.changes 2015-02-27 10:59:28.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xulrunner.new/xulrunner.changes 2015-04-02 16:04:17.000000000 +0200
@@ -1,0 +2,15 @@
+Mon Mar 30 07:56:19 UTC 2015 - wr(a)rosenauer.org
+
+- update to 31.6.0 (bnc#925368)
+ * MFSA 2015-30/CVE-2015-0815
+ Miscellaneous memory safety hazards
+ * MFSA 2015-31/CVE-2015-0813 (bmo#1106596))
+ Use-after-free when using the Fluendo MP3 GStreamer plugin
+ * MFSA 2015-33/CVE-2015-0816 (bmo#1144991)
+ resource:// documents can load privileged pages
+ * MFSA-2015-37/CVE-2015-0807 (bmo#1111834)
+ CORS requests should not follow 30x redirections after preflight
+ * MFSA-2015-40/CVE-2015-0801 (bmo#1146339)
+ Same-origin bypass through anchor navigation
+
+-------------------------------------------------------------------
Old:
----
l10n-31.5.0.tar.xz
xulrunner-31.5.0-source.tar.xz
New:
----
l10n-31.6.0.tar.xz
xulrunner-31.6.0-source.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xulrunner.spec ++++++
--- /var/tmp/diff_new_pack.YwCsOz/_old 2015-04-02 16:04:22.000000000 +0200
+++ /var/tmp/diff_new_pack.YwCsOz/_new 2015-04-02 16:04:22.000000000 +0200
@@ -17,10 +17,10 @@
#
-%define version_internal 31.5.0
+%define version_internal 31.6.0
%define apiversion 31
-%define uaweight 3150000
-%define releasedate 2015021900
+%define uaweight 3160000
+%define releasedate 2015032800
%define shared_js 0
%define has_system_nspr 1
%define has_system_nss 1
++++++ compare-locales.tar.xz ++++++
++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.YwCsOz/_old 2015-04-02 16:04:22.000000000 +0200
+++ /var/tmp/diff_new_pack.YwCsOz/_new 2015-04-02 16:04:22.000000000 +0200
@@ -2,8 +2,8 @@
CHANNEL="esr31"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_31_5_0esr_RELEASE"
-VERSION="31.5.0"
+RELEASE_TAG="FIREFOX_31_6_0esr_RELEASE"
+VERSION="31.6.0"
# mozilla
if [ -d mozilla ]; then
++++++ l10n-31.5.0.tar.xz -> l10n-31.6.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/xulrunner/l10n-31.5.0.tar.xz /work/SRC/openSUSE:Factory/.xulrunner.new/l10n-31.6.0.tar.xz differ: char 27, line 1
++++++ source-stamp.txt ++++++
--- /var/tmp/diff_new_pack.YwCsOz/_old 2015-04-02 16:04:22.000000000 +0200
+++ /var/tmp/diff_new_pack.YwCsOz/_new 2015-04-02 16:04:22.000000000 +0200
@@ -1,2 +1,2 @@
-REV=ebb632066641
+REV=40a8b8411a0c
REPO=http://hg.mozilla.org/releases/mozilla-esr31
++++++ xulrunner-31.5.0-source.tar.xz -> xulrunner-31.6.0-source.tar.xz ++++++
/work/SRC/openSUSE:Factory/xulrunner/xulrunner-31.5.0-source.tar.xz /work/SRC/openSUSE:Factory/.xulrunner.new/xulrunner-31.6.0-source.tar.xz differ: char 27, line 1
1
0
Hello community,
here is the log from the commit of package geary for openSUSE:Factory checked in at 2015-04-02 16:04:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/geary (Old)
and /work/SRC/openSUSE:Factory/.geary.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geary"
Changes:
--------
--- /work/SRC/openSUSE:Factory/geary/geary.changes 2015-03-30 19:11:33.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.geary.new/geary.changes 2015-04-02 16:04:04.000000000 +0200
@@ -1,0 +2,18 @@
+Tue Mar 31 15:02:24 UTC 2015 - zaitor(a)opensuse.org
+
+- Update to version 0.10.0:
+ + Undo Archive/Trash/Move of email (bgo#721828).
+ + New split headerbar layout with UI, composer improvements
+ (bgo#743960).
+ + Preference to switch between 2-column and 3-column layout
+ + (bgo#714793).
+ + Support multiple ("alternate") email addresses per account
+ (bgo#714922).
+ + New shortcut keys to navigate next/previous conversation
+ (bgo#714434).
+ + Fix displaying inline images referenced by Content-ID
+ (bgo#743676).
+ + Numerous bug fixes, optimizations, improvements.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
geary-0.9.1.tar.xz
New:
----
geary-0.10.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ geary.spec ++++++
--- /var/tmp/diff_new_pack.a81x87/_old 2015-04-02 16:04:04.000000000 +0200
+++ /var/tmp/diff_new_pack.a81x87/_new 2015-04-02 16:04:04.000000000 +0200
@@ -17,13 +17,13 @@
Name: geary
-Version: 0.9.1
+Version: 0.10.0
Release: 0
Summary: A lightweight email reader for the GNOME desktop
License: LGPL-2.0+
Group: Productivity/Networking/Email/Clients
Url: http://yorba.org/geary
-Source: http://download.gnome.org/sources/geary/0.9/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/geary/0.10/%{name}-%{version}.tar.xz
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: intltool
++++++ geary-0.9.1.tar.xz -> geary-0.10.0.tar.xz ++++++
++++ 47863 lines of diff (skipped)
1
0