openSUSE Commits
Threads by month
- ----- 2024 -----
- 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
September 2015
- 1 participants
- 1128 discussions
Hello community,
here is the log from the commit of package libusb-1_0 for openSUSE:Factory checked in at 2015-09-24 06:13:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libusb-1_0 (Old)
and /work/SRC/openSUSE:Factory/.libusb-1_0.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libusb-1_0"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libusb-1_0/libusb-1_0.changes 2014-07-26 12:19:43.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libusb-1_0.new/libusb-1_0.changes 2015-09-24 06:13:16.000000000 +0200
@@ -1,0 +2,19 @@
+Mon Sep 14 17:09:43 UTC 2015 - mardnh(a)gmx.de
+
+- Update to version 1.0.20:
+ * Add Haiku support
+ * Fix multiple memory and resource leaks (#16, #52, #76, #81)
+ * Fix possible deadlock when executing transfer callback
+ * New libusb_free_pollfds() API
+ * Darwin: Fix devices not being detected on OS X 10.8 (#48)
+ * Linux: Allow larger isochronous transfer submission (#23)
+ * Windows: Fix broken builds Cygwin/MinGW builds and compiler warnings
+ * Windows: Fix broken bus number lookup
+ * Windows: Improve submission of control requests for composite devices
+ * Examples: Add two-stage load support to fxload (#12)
+ * Correctly report cancellations due to timeouts
+ * Improve efficiency of event handling
+ * Improve speed of transfer submission in multi-threaded environments
+ * Various other bug fixes and improvements
+
+-------------------------------------------------------------------
Old:
----
libusb-1.0.19.tar.bz2
New:
----
libusb-1.0.20.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libusb-1_0.spec ++++++
--- /var/tmp/diff_new_pack.LHLWUL/_old 2015-09-24 06:13:17.000000000 +0200
+++ /var/tmp/diff_new_pack.LHLWUL/_new 2015-09-24 06:13:17.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libusb-1_0
#
-# Copyright (c) 2014 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,7 +17,7 @@
Name: libusb-1_0
-Version: 1.0.19
+Version: 1.0.20
Release: 0
Summary: USB Library
License: LGPL-2.1+
++++++ libusb-1.0.19.tar.bz2 -> libusb-1.0.20.tar.bz2 ++++++
++++ 56037 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package perl-Parse-RecDescent for openSUSE:Factory checked in at 2015-09-24 06:13:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Parse-RecDescent (Old)
and /work/SRC/openSUSE:Factory/.perl-Parse-RecDescent.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Parse-RecDescent"
Changes:
--------
--- /work/SRC/openSUSE:Factory/perl-Parse-RecDescent/perl-Parse-RecDescent.changes 2012-06-01 22:32:33.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.perl-Parse-RecDescent.new/perl-Parse-RecDescent.changes 2015-09-24 06:13:13.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 14 08:51:35 UTC 2015 - coolo(a)suse.com
+
+- updated to 1.967012
+ see /usr/share/doc/packages/perl-Parse-RecDescent/Changes
+
+-------------------------------------------------------------------
Old:
----
Parse-RecDescent-1.967009.tar.gz
New:
----
Parse-RecDescent-1.967012.tar.gz
cpanspec.yml
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Parse-RecDescent.spec ++++++
--- /var/tmp/diff_new_pack.8cXTJm/_old 2015-09-24 06:13:14.000000000 +0200
+++ /var/tmp/diff_new_pack.8cXTJm/_new 2015-09-24 06:13:14.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-Parse-RecDescent
#
-# 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,24 +17,19 @@
Name: perl-Parse-RecDescent
-Version: 1.967009
+Version: 1.967012
Release: 0
%define cpan_name Parse-RecDescent
Summary: Generate Recursive-Descent Parsers
License: GPL-1.0+ or Artistic-1.0
Group: Development/Libraries/Perl
Url: http://search.cpan.org/dist/Parse-RecDescent/
-Source: http://www.cpan.org/authors/id/J/JT/JTBRAUN/%{cpan_name}-%{version}.tar.gz
+Source0: http://www.cpan.org/authors/id/J/JT/JTBRAUN/%{cpan_name}-%{version}.tar.gz
+Source1: cpanspec.yml
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
-BuildRequires: perl(ExtUtils::MakeMaker) >= 6.57
BuildRequires: perl(Module::Build)
-#BuildRequires: perl(AutoDump)
-#BuildRequires: perl(Calc)
-#BuildRequires: perl(CGrammar)
-#BuildRequires: perl(DecommentGrammar)
-#BuildRequires: perl(Parse::RecDescent)
%{perl_requires}
%description
++++++ Parse-RecDescent-1.967009.tar.gz -> Parse-RecDescent-1.967012.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Parse-RecDescent-1.967009/Changes new/Parse-RecDescent-1.967012/Changes
--- old/Parse-RecDescent-1.967009/Changes 2012-03-16 15:25:51.000000000 +0100
+++ new/Parse-RecDescent-1.967012/Changes 2015-09-13 17:00:59.000000000 +0200
@@ -753,45 +753,82 @@
1.967_005 Wed Feb 8 18:46:35 2012
- - Added JTBRAUN(a)CPAN.org as author in Build.PL.
+ - Added JTBRAUN(a)CPAN.org as author in Build.PL.
- - Added ExtUtils::MakeMaker build/configure version
- requirements. (RT.cpan.org #74787, Thanks POPEL!)
+ - Added ExtUtils::MakeMaker build/configure version
+ requirements. (RT.cpan.org #74787, Thanks POPEL!)
1.967006 Fri Feb 10 20:48:48 2012
- - Bumped version to 1.967006 for non-development release.
+ - Bumped version to 1.967006 for non-development release.
1.967_007 Thu Feb 23 07:26:03 2012
- - Revised ExtUtils::MakeMaker build/configure version
- requirements. (RT.cpan.org #74787, Thanks Paul!)
+ - Revised ExtUtils::MakeMaker build/configure version
+ requirements. (RT.cpan.org #74787, Thanks Paul!)
- - Revised Text::Balanced prereq to require version 1.95,
- necessary for t/skip.t to pass.
- (RT.cpan.org #74787, Thanks Paul!)
-
- - Removed unused version.pm prereq.
-
- - Fix a circular reference memory leak caused by the use of
- $AUTOLOAD in sub AUTOLOAD{} in the generated parser's
- namespace. Workaround documented in perl5 RT #110248.
- Workaround a circular reference memory leak in ISA documented
- by perl5 RT #92708. A parser's DESTROY() method redefines all
- subs before deleting the stash, to avoid circular references
- between subrules. (RT #53710, thanks Andreas!)
-
- - Parse::RecDescent::AUTOLOAD did not correctly handle
- initializing the line counting mechanism when a reference to a
- scalar was passed to the parser. (RT.cpan.org #27705, thanks
- Justin!)
+ - Revised Text::Balanced prereq to require version 1.95, necessary
+ for t/skip.t to pass. (RT.cpan.org #74787, Thanks Paul!)
+
+ - Removed unused version.pm prereq.
+
+ - Fix a circular reference memory leak caused by the use of
+ $AUTOLOAD in sub AUTOLOAD{} in the generated parser's namespace.
+ Workaround documented in perl5 RT #110248. Workaround a
+ circular reference memory leak in ISA documented by perl5 RT
+ #92708. A parser's DESTROY() method redefines all subs before
+ deleting the stash, to avoid circular references between
+ subrules. (RT #53710, thanks Andreas!)
+
+ - Parse::RecDescent::AUTOLOAD did not correctly handle
+ initializing the line counting mechanism when a reference to a
+ scalar was passed to the parser. (RT.cpan.org #27705, thanks
+ Justin!)
1.967_008 Tue Mar 13 22:28:00 2012
- - Restore old _parserepeat calling convention. Change a
- parser's DESTROY method to check for $self->{_not_precompiled}
- instead of $self->{_precompiled}. (Fix for RT #74593).
+ - Restore old _parserepeat calling convention. Change a parser's
+ DESTROY method to check for $self->{_not_precompiled} instead of
+ $self->{_precompiled}. (Fix for RT #74593).
1.967009 Fri Mar 16 07:25:09 2012
- - Bumped version to 1.967009 for non-development release.
+ - Bumped version to 1.967009 for non-development release.
+
+1.967_010 Sun Jul 7 11:23:53 2013
+
+ - Base the standalone precompiled parser's runtime name on the
+ parser's class, rather than use the fixed
+ "Parse::RecDescent::_Runtime". This prevents "already defined"
+ warnings when two standalone precompiled parsers are used.
+
+ - Add support for allowing precompiled parsers to share a common
+ runtime via the Precompile({-runtime_class}) option and the
+ PrecompiledRuntime() function.
+
+ - Warn on creation of Precompiled parsers that depend on
+ Parse::RecDescent.
+
+ - *** NON-BACKWARDS COMPATIBLE CHANGE! *** Change global the
+ <skip:> directive to eval similar to other <skip:> directives,
+ rather than being single-quoted in the resulting parser.
+
+1.967011 Sat Sep 12 16:42:01 2015
+
+ - Correct some typos in the documentation. (RT.cpan.org #87185,
+ thanks dsteinbrunner!)
+
+ - Sort hash keys and rulenames when generating code. This keeps
+ the output text for a given input text the same, reducing
+ differences in automated builds. (RT.cpan.org #102160, thanks
+ Reiner!)
+
+ - Precompiled parsers now document which
+ $Parse::RecDescent::VERSION was used to generate
+ them. (RT.cpan.org #77001)
+
+1.967012 Sun Sep 13 07:59:00 2015
+
+ - Reference Data::Dumper::Sortkeys, not SortKeys. Actually
+ produces reproducible precompiled parsers now. (RT.cpan.org
+ #107061, thanks Slaven!)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Parse-RecDescent-1.967009/MANIFEST new/Parse-RecDescent-1.967012/MANIFEST
--- old/Parse-RecDescent-1.967009/MANIFEST 2012-03-16 15:27:02.000000000 +0100
+++ new/Parse-RecDescent-1.967012/MANIFEST 2015-09-13 02:44:06.000000000 +0200
@@ -78,6 +78,7 @@
t/precompile.t
t/re_capture_return.t
t/reentry.t
+t/reproducible.t
t/separated_repetition.t
t/skip.t
t/skip_dynamic.t
@@ -88,5 +89,3 @@
tutorial/TPJ_maze.gif
tutorial/TPJ_tree.gif
tutorial/tutorial.html
-META.yml Module YAML meta-data (added by MakeMaker)
-META.json Module JSON meta-data (added by MakeMaker)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Parse-RecDescent-1.967009/META.json new/Parse-RecDescent-1.967012/META.json
--- old/Parse-RecDescent-1.967009/META.json 2012-03-16 15:27:02.000000000 +0100
+++ new/Parse-RecDescent-1.967012/META.json 1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-{
- "abstract" : "Generate Recursive-Descent Parsers",
- "author" : [
- "Damian Conway <DCONWAY(a)CPAN.org>",
- "Jeremy T. Braun <JTBRAUN(a)CPAN.org>"
- ],
- "dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.113640",
- "license" : [
- "unknown"
- ],
- "meta-spec" : {
- "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
- "version" : "2"
- },
- "name" : "Parse-RecDescent",
- "no_index" : {
- "directory" : [
- "t",
- "inc"
- ]
- },
- "prereqs" : {
- "build" : {
- "requires" : {
- "ExtUtils::MakeMaker" : "6.5702"
- }
- },
- "configure" : {
- "requires" : {
- "ExtUtils::MakeMaker" : "6.5702"
- }
- },
- "runtime" : {
- "requires" : {
- "Test::More" : 0,
- "Text::Balanced" : "1.95"
- }
- }
- },
- "release_status" : "stable",
- "version" : "1.967009"
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Parse-RecDescent-1.967009/META.yml new/Parse-RecDescent-1.967012/META.yml
--- old/Parse-RecDescent-1.967009/META.yml 2012-03-16 15:27:02.000000000 +0100
+++ new/Parse-RecDescent-1.967012/META.yml 1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
----
-abstract: 'Generate Recursive-Descent Parsers'
-author:
- - 'Damian Conway <DCONWAY(a)CPAN.org>'
- - 'Jeremy T. Braun <JTBRAUN(a)CPAN.org>'
-build_requires:
- ExtUtils::MakeMaker: 6.5702
-configure_requires:
- ExtUtils::MakeMaker: 6.5702
-dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 6.62, CPAN::Meta::Converter version 2.113640'
-license: unknown
-meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.4.html
- version: 1.4
-name: Parse-RecDescent
-no_index:
- directory:
- - t
- - inc
-requires:
- Test::More: 0
- Text::Balanced: 1.95
-version: 1.967009
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Parse-RecDescent-1.967009/README new/Parse-RecDescent-1.967012/README
--- old/Parse-RecDescent-1.967009/README 2012-03-16 15:26:10.000000000 +0100
+++ new/Parse-RecDescent-1.967012/README 2015-09-13 17:01:10.000000000 +0200
@@ -1,4 +1,4 @@
-Parse::RecDescent version 1.967009
+Parse::RecDescent version 1.967012
NAME
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Parse-RecDescent-1.967009/lib/Parse/RecDescent.pm new/Parse-RecDescent-1.967012/lib/Parse/RecDescent.pm
--- old/Parse-RecDescent-1.967009/lib/Parse/RecDescent.pm 2012-03-16 15:26:26.000000000 +0100
+++ new/Parse-RecDescent-1.967012/lib/Parse/RecDescent.pm 2015-09-13 17:01:33.000000000 +0200
@@ -16,7 +16,7 @@
#ifndef RUNTIME
sub import # IMPLEMENT PRECOMPILER BEHAVIOUR UNDER:
- # perl -MParse::RecDescent - <grammarfile> <classname>
+ # perl -MParse::RecDescent - <grammarfile> <classname> [runtimeclassname]
{
local *_die = sub { print @_, "\n"; exit };
@@ -25,9 +25,9 @@
if ($file eq '-' && $line == 0)
{
_die("Usage: perl -MLocalTest - <grammarfile> <classname>")
- unless @ARGV == 2;
+ unless @ARGV >= 2 and $ARGV <= 3;
- my ($sourcefile, $class) = @ARGV;
+ my ($sourcefile, $class, $runtime_class) = @ARGV;
local *IN;
open IN, $sourcefile
@@ -36,7 +36,8 @@
my $grammar = <IN>;
close IN;
- Parse::RecDescent->Precompile($grammar, $class, $sourcefile);
+ Parse::RecDescent->Precompile({ -runtime_class => $runtime_class },
+ $grammar, $class, $sourcefile);
exit;
}
}
@@ -55,10 +56,21 @@
$self->{saving} = 0;
}
+sub PrecompiledRuntime
+{
+ my ($self, $class) = @_;
+ my $opt = {
+ -standalone => 1,
+ -runtime_class => $class,
+ };
+ $self->Precompile($opt, '', $class);
+}
+
sub Precompile
{
my $self = shift;
- my %opt = ( -standalone => 0 );
+ my %opt = ( -standalone => 0,
+ );
if ('HASH' eq ref $_[0]) {
%opt = (%opt, %{$_[0]});
shift;
@@ -71,21 +83,75 @@
$modulefile =~ s/.*:://;
$modulefile .= ".pm";
- my $runtime_package = 'Parse::RecDescent::_Runtime';
- my $code;
+ my $code = '';
local *OUT;
open OUT, ">", $modulefile
or croak("Can't write to new module file '$modulefile'");
+ print OUT "#\n",
+ "# This parser was generated with\n",
+ "# Parse::RecDescent version $Parse::RecDescent::VERSION\n",
+ "#\n\n";
+
print STDERR "precompiling grammar from file '$sourcefile'\n",
"to class $class in module file '$modulefile'\n"
if $grammar && $sourcefile;
- # Make the resulting pre-compiled parser stand-alone by
- # including the contents of Parse::RecDescent as
- # Parse::RecDescent::Runtime in the resulting precompiled
- # parser.
+ if ($grammar) {
+ $self = Parse::RecDescent->new($grammar, # $grammar
+ 1, # $compiling
+ $class # $namespace
+ )
+ || croak("Can't compile bad grammar")
+ if $grammar;
+
+ # Do not allow &DESTROY to remove the precompiled namespace
+ delete $self->{_not_precompiled};
+
+ foreach ( keys %{$self->{rules}} ) {
+ $self->{rules}{$_}{changed} = 1;
+ }
+
+ $code = $self->_code();
+ }
+
+ # If a name for the runtime package was not provided,
+ # generate one based on the module output name and the generated
+ # code
+ if (not defined($opt{-runtime_class})) {
+ if ($opt{-standalone}) {
+ my $basename = $class . '::_Runtime';
+
+ my $name = $basename;
+
+ for (my $i = 0; $code =~ /$basename/; ++$i) {
+ $name = sprintf("%s%06d", $basename, $i);
+ }
+
+ $opt{-runtime_class} = $name;
+ } else {
+ my $package = ref $self;
+ local $::RD_HINT = defined $::RD_HINT ? $::RD_HINT : 1;
+ _hint(<<EOWARNING);
+The precompiled grammar did not specify the -runtime_class
+option. The resulting parser will "use $package". Future changes to
+$package may cause $class to stop working.
+
+Consider building a -standalone parser, or providing the
+-runtime_class option as described in Parse::RecDescent's POD.
+
+Use \$::RD_HINT = 0 to disable this message.
+EOWARNING
+ $opt{-runtime_class} = $package;
+ }
+ }
+
+ $code =~ s/Parse::RecDescent/$opt{-runtime_class}/gs;
+
+ # Make the resulting pre-compiled parser stand-alone by including
+ # the contents of Parse::RecDescent as -runtime_class in the
+ # resulting precompiled parser.
if ($opt{-standalone}) {
local *IN;
open IN, '<', $Parse::RecDescent::_FILENAME
@@ -104,7 +170,8 @@
if ($_ =~ m/^__END__/) {
last;
}
- s/Parse::RecDescent/$runtime_package/gs;
+
+ s/Parse::RecDescent/$opt{-runtime_class}/gs;
print OUT $_;
}
}
@@ -112,45 +179,32 @@
print OUT "}\n";
}
- $self = Parse::RecDescent->new($grammar, # $grammar
- 1, # $compiling
- $class # $namespace
- )
- || croak("Can't compile bad grammar")
- if $grammar;
-
- # Do not allow &DESTROY to remove the precompiled namespace
- delete $self->{_not_precompiled};
-
- foreach ( keys %{$self->{rules}} ) {
- $self->{rules}{$_}{changed} = 1;
+ if ($grammar) {
+ print OUT "package $class;\n";
}
-
- print OUT "package $class;\n";
if (not $opt{-standalone}) {
- print OUT "use Parse::RecDescent;\n";
+ print OUT "use $opt{-runtime_class};\n";
}
- print OUT "{ my \$ERRORS;\n\n";
+ if ($grammar) {
+ print OUT "{ my \$ERRORS;\n\n";
- $code = $self->_code();
- if ($opt{-standalone}) {
- $code =~ s/Parse::RecDescent/$runtime_package/gs;
- }
- print OUT $code;
+ print OUT $code;
- print OUT "}\npackage $class; sub new { ";
- print OUT "my ";
+ print OUT "}\npackage $class; sub new { ";
+ print OUT "my ";
- require Data::Dumper;
- $code = Data::Dumper->Dump([$self], [qw(self)]);
- if ($opt{-standalone}) {
- $code =~ s/Parse::RecDescent/$runtime_package/gs;
- }
- print OUT $code;
+ require Data::Dumper;
+ # Sort the keys to ensure the output is reproducible
+ local $Data::Dumper::Sortkeys = 1;
+ $code = Data::Dumper->Dump([$self], [qw(self)]);
+ $code =~ s/Parse::RecDescent/$opt{-runtime_class}/gs;
- print OUT "}";
+ print OUT $code;
+
+ print OUT "}";
+ }
close OUT
or croak("Can't write to new module file '$modulefile'");
@@ -1896,7 +1950,7 @@
my $ERRORS = 0;
-our $VERSION = '1.967009';
+our $VERSION = '1.967012';
$VERSION = eval $VERSION;
$_FILENAME=__FILE__;
@@ -2018,61 +2072,61 @@
to be part of.");
}
-my $NEGLOOKAHEAD = '\G(\s*\.\.\.\!)';
-my $POSLOOKAHEAD = '\G(\s*\.\.\.)';
-my $RULE = '\G\s*(\w+)[ \t]*:';
-my $PROD = '\G\s*([|])';
-my $TOKEN = q{\G\s*/((\\\\/|\\\\\\\\|[^/])*)/([cgimsox]*)};
-my $MTOKEN = q{\G\s*(m\s*[^\w\s])};
-my $LITERAL = q{\G\s*'((\\\\['\\\\]|[^'])*)'};
+my $NEGLOOKAHEAD = '\G(\s*\.\.\.\!)';
+my $POSLOOKAHEAD = '\G(\s*\.\.\.)';
+my $RULE = '\G\s*(\w+)[ \t]*:';
+my $PROD = '\G\s*([|])';
+my $TOKEN = q{\G\s*/((\\\\/|\\\\\\\\|[^/])*)/([cgimsox]*)};
+my $MTOKEN = q{\G\s*(m\s*[^\w\s])};
+my $LITERAL = q{\G\s*'((\\\\['\\\\]|[^'])*)'};
my $INTERPLIT = q{\G\s*"((\\\\["\\\\]|[^"])*)"};
-my $SUBRULE = '\G\s*(\w+)';
-my $MATCHRULE = '\G(\s*<matchrule:)';
-my $SIMPLEPAT = '((\\s+/[^/\\\\]*(?:\\\\.[^/\\\\]*)*/)?)';
-my $OPTIONAL = '\G\((\?)'.$SIMPLEPAT.'\)';
-my $ANY = '\G\((s\?)'.$SIMPLEPAT.'\)';
-my $MANY = '\G\((s|\.\.)'.$SIMPLEPAT.'\)';
-my $EXACTLY = '\G\(([1-9]\d*)'.$SIMPLEPAT.'\)';
-my $BETWEEN = '\G\((\d+)\.\.([1-9]\d*)'.$SIMPLEPAT.'\)';
-my $ATLEAST = '\G\((\d+)\.\.'.$SIMPLEPAT.'\)';
-my $ATMOST = '\G\(\.\.([1-9]\d*)'.$SIMPLEPAT.'\)';
-my $BADREP = '\G\((-?\d+)?\.\.(-?\d+)?'.$SIMPLEPAT.'\)';
-my $ACTION = '\G\s*\{';
-my $IMPLICITSUBRULE = '\G\s*\(';
-my $COMMENT = '\G\s*(#.*)';
-my $COMMITMK = '\G\s*<commit>';
-my $UNCOMMITMK = '\G\s*<uncommit>';
-my $QUOTELIKEMK = '\G\s*<perl_quotelike>';
-my $CODEBLOCKMK = '\G\s*<perl_codeblock(?:\s+([][()<>{}]+))?>';
-my $VARIABLEMK = '\G\s*<perl_variable>';
-my $NOCHECKMK = '\G\s*<nocheck>';
-my $AUTOACTIONPATMK = '\G\s*<autoaction:';
-my $AUTOTREEMK = '\G\s*<autotree(?::\s*([\w:]+)\s*)?>';
-my $AUTOSTUBMK = '\G\s*<autostub>';
-my $AUTORULEMK = '\G\s*<autorule:(.*?)>';
-my $REJECTMK = '\G\s*<reject>';
-my $CONDREJECTMK = '\G\s*<reject:';
-my $SCOREMK = '\G\s*<score:';
-my $AUTOSCOREMK = '\G\s*<autoscore:';
-my $SKIPMK = '\G\s*<skip:';
-my $OPMK = '\G\s*<(left|right)op(?:=(\'.*?\'))?:';
-my $ENDDIRECTIVEMK = '\G\s*>';
-my $RESYNCMK = '\G\s*<resync>';
-my $RESYNCPATMK = '\G\s*<resync:';
-my $RULEVARPATMK = '\G\s*<rulevar:';
-my $DEFERPATMK = '\G\s*<defer:';
-my $TOKENPATMK = '\G\s*<token:';
-my $AUTOERRORMK = '\G\s*<error(\??)>';
-my $MSGERRORMK = '\G\s*<error(\??):';
-my $NOCHECK = '\G\s*<nocheck>';
-my $WARNMK = '\G\s*<warn((?::\s*(\d+)\s*)?)>';
-my $HINTMK = '\G\s*<hint>';
-my $TRACEBUILDMK = '\G\s*<trace_build((?::\s*(\d+)\s*)?)>';
-my $TRACEPARSEMK = '\G\s*<trace_parse((?::\s*(\d+)\s*)?)>';
+my $SUBRULE = '\G\s*(\w+)';
+my $MATCHRULE = '\G(\s*<matchrule:)';
+my $SIMPLEPAT = '((\\s+/[^/\\\\]*(?:\\\\.[^/\\\\]*)*/)?)';
+my $OPTIONAL = '\G\((\?)'.$SIMPLEPAT.'\)';
+my $ANY = '\G\((s\?)'.$SIMPLEPAT.'\)';
+my $MANY = '\G\((s|\.\.)'.$SIMPLEPAT.'\)';
+my $EXACTLY = '\G\(([1-9]\d*)'.$SIMPLEPAT.'\)';
+my $BETWEEN = '\G\((\d+)\.\.([1-9]\d*)'.$SIMPLEPAT.'\)';
+my $ATLEAST = '\G\((\d+)\.\.'.$SIMPLEPAT.'\)';
+my $ATMOST = '\G\(\.\.([1-9]\d*)'.$SIMPLEPAT.'\)';
+my $BADREP = '\G\((-?\d+)?\.\.(-?\d+)?'.$SIMPLEPAT.'\)';
+my $ACTION = '\G\s*\{';
+my $IMPLICITSUBRULE = '\G\s*\(';
+my $COMMENT = '\G\s*(#.*)';
+my $COMMITMK = '\G\s*<commit>';
+my $UNCOMMITMK = '\G\s*<uncommit>';
+my $QUOTELIKEMK = '\G\s*<perl_quotelike>';
+my $CODEBLOCKMK = '\G\s*<perl_codeblock(?:\s+([][()<>{}]+))?>';
+my $VARIABLEMK = '\G\s*<perl_variable>';
+my $NOCHECKMK = '\G\s*<nocheck>';
+my $AUTOACTIONPATMK = '\G\s*<autoaction:';
+my $AUTOTREEMK = '\G\s*<autotree(?::\s*([\w:]+)\s*)?>';
+my $AUTOSTUBMK = '\G\s*<autostub>';
+my $AUTORULEMK = '\G\s*<autorule:(.*?)>';
+my $REJECTMK = '\G\s*<reject>';
+my $CONDREJECTMK = '\G\s*<reject:';
+my $SCOREMK = '\G\s*<score:';
+my $AUTOSCOREMK = '\G\s*<autoscore:';
+my $SKIPMK = '\G\s*<skip:';
+my $OPMK = '\G\s*<(left|right)op(?:=(\'.*?\'))?:';
+my $ENDDIRECTIVEMK = '\G\s*>';
+my $RESYNCMK = '\G\s*<resync>';
+my $RESYNCPATMK = '\G\s*<resync:';
+my $RULEVARPATMK = '\G\s*<rulevar:';
+my $DEFERPATMK = '\G\s*<defer:';
+my $TOKENPATMK = '\G\s*<token:';
+my $AUTOERRORMK = '\G\s*<error(\??)>';
+my $MSGERRORMK = '\G\s*<error(\??):';
+my $NOCHECK = '\G\s*<nocheck>';
+my $WARNMK = '\G\s*<warn((?::\s*(\d+)\s*)?)>';
+my $HINTMK = '\G\s*<hint>';
+my $TRACEBUILDMK = '\G\s*<trace_build((?::\s*(\d+)\s*)?)>';
+my $TRACEPARSEMK = '\G\s*<trace_parse((?::\s*(\d+)\s*)?)>';
my $UNCOMMITPROD = $PROD.'\s*<uncommit';
my $ERRORPROD = $PROD.'\s*<error';
-my $LONECOLON = '\G\s*:';
-my $OTHER = '\G\s*([^\s]+)';
+my $LONECOLON = '\G\s*:';
+my $OTHER = '\G\s*([^\s]+)';
my @lines = 0;
@@ -2532,7 +2586,7 @@
_parseunneg("a rule declaration", 0,
$lookahead,$line, substr($grammar, $-[0], $+[0] - $-[0]) ) or next;
my $rulename = $1;
- if ($rulename =~ /Replace|Extend|Precompile|Save/ )
+ if ($rulename =~ /Replace|Extend|Precompile|PrecompiledRuntime|Save/ )
{
_warn(2,"Rule \"$rulename\" hidden by method
Parse::RecDescent::$rulename",$line)
@@ -3049,14 +3103,17 @@
sub _code($)
{
my $self = shift;
- my $initial_skip = defined($self->{skip}) ? $self->{skip} : $skip;
+ require Data::Dumper;
+ my $initial_skip = defined($self->{skip}) ?
+ '$skip = ' . $self->{skip} . ';' :
+ Data::Dumper->Dump([$skip],[qw(skip)]);
my $code = qq!
package $self->{namespace};
use strict;
use vars qw(\$skip \$AUTOLOAD $self->{localvars} );
\@$self->{namespace}\::ISA = ();
-\$skip = '$initial_skip';
+$initial_skip
$self->{startcode}
{
@@ -3082,7 +3139,9 @@
$self->{"startcode"} = '';
my $rule;
- foreach $rule ( values %{$self->{"rules"}} )
+ # sort the rules to ensure the output is reproducible
+ foreach $rule ( sort { $a->{name} cmp $b->{name} }
+ values %{$self->{"rules"}} )
{
if ($rule->{"changed"})
{
@@ -3427,8 +3486,8 @@
=head1 VERSION
-This document describes version 1.967009 of Parse::RecDescent
-released March 16th, 2012.
+This document describes version 1.967012 of Parse::RecDescent
+released September 13th, 2015.
=head1 SYNOPSIS
@@ -3881,7 +3940,7 @@
The results of named subrules are stored in the hash under each
subrule's name (including the repetition specifier, if any),
whilst all other items are stored under a "named
-positional" key that indictates their ordinal position within their item
+positional" key that indicates their ordinal position within their item
type: __STRINGI<n>__, __PATTERNI<n>__, __DIRECTIVEI<n>__, __ACTIONI<n>__:
stuff: /various/ bits 'and' pieces "then" data 'end' { save }
@@ -4407,7 +4466,7 @@
Normally, if a subrule appears in some production, but no rule of that
name is ever defined in the grammar, the production which refers to the
non-existent subrule fails immediately. This typically occurs as a
-result of misspellings, and is a sufficiently common occurance that a
+result of misspellings, and is a sufficiently common occurrence that a
warning is generated for such situations.
However, when prototyping a grammar it is sometimes useful to be
@@ -4493,7 +4552,7 @@
inner_word: word ...!......!word
-is exactly equivalent the the original example above (a warning is issued in
+is exactly equivalent to the original example above (a warning is issued in
cases like these, since they often indicate something left out, or
misunderstood).
@@ -4660,19 +4719,20 @@
OneLiner: Command <skip:'[ \t]*'> Arg(s) /;/
-causes only blanks and tabs to be skipped before terminals in the C<Arg>
-subrule (and any of I<its> subrules>, and also before the final C</;/> terminal.
-Once the production is complete, the previous terminal prefix is
-reinstated. Note that this implies that distinct productions of a rule
-must reset their terminal prefixes individually.
+causes only blanks and tabs to be skipped before terminals in the
+C<Arg> subrule (and any of I<its> subrules>, and also before the final
+C</;/> terminal. Once the production is complete, the previous
+terminal prefix is reinstated. Note that this implies that distinct
+productions of a rule must reset their terminal prefixes individually.
-The C<E<lt>skipE<gt>> directive evaluates to the I<previous> terminal prefix,
-so it's easy to reinstate a prefix later in a production:
+The C<E<lt>skipE<gt>> directive evaluates to the I<previous> terminal
+prefix, so it's easy to reinstate a prefix later in a production:
Command: <skip:","> CSV(s) <skip:$item[1]> Modifier
-The value specified after the colon is interpolated into a pattern, so all of
-the following are equivalent (though their efficiency increases down the list):
+The value specified after the colon is interpolated into a pattern, so
+all of the following are equivalent (though their efficiency increases
+down the list):
<skip: "$colon|$comma"> # ASSUMING THE VARS HOLD THE OBVIOUS VALUES
@@ -4716,10 +4776,15 @@
C<Rule_with_dynamic_skip> and have it skip whatever you specified.
B<Note: Up to release 1.51 of Parse::RecDescent, an entirely different
-mechanism was used for specifying terminal prefixes. The current method
-is not backwards-compatible with that early approach. The current approach
-is stable and will not to change again.>
-
+mechanism was used for specifying terminal prefixes. The current
+method is not backwards-compatible with that early approach. The
+current approach is stable and will not change again.>
+
+B<Note: the global C<E<lt>skipE<gt>> directive added in 1.967_004 did
+not interpolate the pattern argument, instead the pattern was placed
+inside of single quotes and then interpolated. This behavior was
+changed in 1.967_010 so that all C<E<lt>skipE<gt>> directives behavior
+similarly.>
=item Resynchronization
@@ -4953,7 +5018,7 @@
grammar: C<< <warn> >>. It takes an optional argument, which specifies
the warning level: C<< <warn: 2> >>.
-See F<"DIAGNOSTICS"> for a list of the varous error and warning messages
+See F<"DIAGNOSTICS"> for a list of the various error and warning messages
that Parse::RecDescent generates when these two variables are defined.
Defining any of the remaining variables (which are not defined by
@@ -5273,7 +5338,7 @@
In this case, even though the first production of C<sentence> caused
the subrules C<noun> and C<trans> to match, that production ultimately
failed and so the deferred actions queued by those subrules were subsequently
-disgarded. The second production then succeeded, causing the entire
+discarded. The second production then succeeded, causing the entire
parse to succeed, and so the deferred actions queued by the (second) match of
the C<noun> subrule and the subsequent match of C<intrans> I<are> preserved and
eventually executed.
@@ -5618,7 +5683,7 @@
"fruit flies like a banana", then the second production is probably
the right match.
-To cater for such situtations, the C<E<lt>score:...E<gt>> can be used.
+To cater for such situations, the C<E<lt>score:...E<gt>> can be used.
The directive is equivalent to an unconditional C<E<lt>rejectE<gt>>,
except that it allows you to specify a "score" for the current
production. If that score is numerically greater than the best
@@ -5921,7 +5986,7 @@
$add = "name: 'Jimmy-Bob' | 'Bobby-Jim'\ndesc: colour /necks?/";
parser->Replace($add);
-are are I<only> valid "name"s and the one possible description.
+there are I<only> valid "name"s and the one possible description.
A more interesting use of the C<Extend> and C<Replace> methods is to call them
inside the action of an executing parser. For example:
@@ -5986,7 +6051,7 @@
use Parse::RecDescent;
- Parse::RecDescent->Precompile([$options_hashref], $grammar, "PreGrammar");
+ Parse::RecDescent->Precompile([$options_hashref], $grammar, "PreGrammar", ["RuntimeClass"]);
The first required argument is the grammar string, the second is the
name of the class to be built. The name of the module file is
@@ -5997,10 +6062,14 @@
would produce a module file named Parser.pm.
+After the class name, you may specify the name of the runtime_class
+called by the Precompiled parser. See L</"Precompiled runtimes"> for
+more details.
+
An optional hash reference may be supplied as the first argument to
C<Precompile>. This argument is currently EXPERIMENTAL, and may change
in a future release of Parse::RecDescent. The only supported option
-is currently C<-standalone>, see L</"Standalone Precompiled Parsers">.
+is currently C<-standalone>, see L</"Standalone precompiled parsers">.
It is somewhat tedious to have to write a small Perl program just to
generate a precompiled grammar class, so Parse::RecDescent has some special
@@ -6009,7 +6078,7 @@
If your grammar is specified in a file named F<grammar>, you can generate
a class named Yet::Another::Grammar like so:
- > perl -MParse::RecDescent - grammar Yet::Another::Grammar
+ > perl -MParse::RecDescent - grammar Yet::Another::Grammar [Runtime::Class]
This would produce a file named F<Grammar.pm> containing the full
definition of a class called Yet::Another::Grammar. Of course, to use
@@ -6040,7 +6109,7 @@
it has no effect on I<parsing> speed. RecDescent 2.0 will address that
problem.
-=head3 Standalone Precompiled Parsers
+=head3 Standalone precompiled parsers
Until version 1.967003 of Parse::RecDescent, parser modules built with
C<Precompile> were dependent on Parse::RecDescent. Future
@@ -6051,19 +6120,59 @@
itself in the resulting .pm file if you pass the boolean option
C<-standalone> to C<Precompile>:
- Parse::RecDescent->Precompile({ -standalone = 1, },
+ Parse::RecDescent->Precompile({ -standalone => 1, },
$grammar, "My::New::Parser");
-Parse::RecDescent is included as Parse::RecDescent::_Runtime in order
-to avoid conflicts between an installed version of Parse::RecDescent
-and a precompiled, standalone parser made with another version of
-Parse::RecDescent. This renaming is experimental, and is subject to
-change in future versions.
+Parse::RecDescent is included as C<$class::_Runtime> in order to avoid
+conflicts between an installed version of Parse::RecDescent and other
+precompiled, standalone parser made with Parse::RecDescent. The name
+of this class may be changed with the C<-runtime_class> option to
+Precompile. This renaming is experimental, and is subject to change
+in future versions.
Precompiled parsers remain dependent on Parse::RecDescent by default,
as this feature is still considered experimental. In the future,
standalone parsers will become the default.
+=head3 Precompiled runtimes
+
+Standalone precompiled parsers each include a copy of
+Parse::RecDescent. For users who have a family of related precompiled
+parsers, this is very inefficient. C<Precompile> now supports an
+experimental C<-runtime_class> option. To build a precompiled parser
+with a different runtime name, call:
+
+ Parse::RecDescent->Precompile({
+ -standalone => 1,
+ -runtime_class => "My::Runtime",
+ },
+ $grammar, "My::New::Parser");
+
+The resulting standalone parser will contain a copy of
+Parse::RecDescent, renamed to "My::Runtime".
+
+To build a set of parsers that C<use> a custom-named runtime, without
+including that runtime in the output, simply build those parsers with
+C<-runtime_class> and without C<-standalone>:
+
+ Parse::RecDescent->Precompile({
+ -runtime_class => "My::Runtime",
+ },
+ $grammar, "My::New::Parser");
+
+The runtime itself must be generated as well, so that it may be
+C<use>d by My::New::Parser. To generate the runtime file, use one of
+the two folling calls:
+
+ Parse::RecDescent->PrecompiledRuntime("My::Runtime");
+
+ Parse::RecDescent->Precompile({
+ -standalone => 1,
+ -runtime_class => "My::Runtime",
+ },
+ '', # empty grammar
+ "My::Runtime");
+
=head1 GOTCHAS
This section describes common mistakes that grammar writers seem to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Parse-RecDescent-1.967009/t/precompile.t new/Parse-RecDescent-1.967012/t/precompile.t
--- old/Parse-RecDescent-1.967009/t/precompile.t 2012-02-09 04:10:52.000000000 +0100
+++ new/Parse-RecDescent-1.967012/t/precompile.t 2015-09-13 02:44:06.000000000 +0200
@@ -3,6 +3,9 @@
use Parse::RecDescent;
use Test::More tests => 14;
+# Turn off the "build a -standalone parser" precompile warning
+our $RD_HINT = 0;
+
# mask "subroutine element redefined" warnings
local $^W;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Parse-RecDescent-1.967009/t/reproducible.t new/Parse-RecDescent-1.967012/t/reproducible.t
--- old/Parse-RecDescent-1.967009/t/reproducible.t 1970-01-01 01:00:00.000000000 +0100
+++ new/Parse-RecDescent-1.967012/t/reproducible.t 2015-09-13 16:57:36.000000000 +0200
@@ -0,0 +1,421 @@
+# Ensure that the output of Parse::RecDescent is the same, time after
+# time. This prevents automated builds with precompiled parsers from
+# registering changes, with no change input.
+
+use strict;
+use warnings;
+use Parse::RecDescent;
+use Test::More tests => 41;
+
+# Turn off the "build a -standalone parser" precompile warning
+our $RD_HINT = 0;
+
+# mask "subroutine element redefined" warnings
+local $^W;
+
+my $grammar = <<'EOGRAMMAR';
+
+
+ translation_unit:
+ external_declaration(s)
+ | <error>
+
+ external_declaration:
+ function_definition
+ | declaration
+ | <resync>
+ {
+ if ($::opt_SKIPPEDLINES || (defined $::opt_VERBOSE and $::opt_VERBOSE >= 1 ))
+ {
+ print "Skipping line $thisline\n" # Try next line if possible...
+ }
+ }
+
+ function_definition:
+ declaration_specifiers(?) declarator declaration_list(?) compound_statement
+ {
+ if($::opt_FUNCTIONS)
+ {
+ $::functions_output .= ::flatten_list($item[1]);
+ $::functions_output .= ::flatten_list($item[2]);
+ $::functions_output .= ::flatten_list($item[3]) . ";\n";
+ }
+ }
+
+ declaration:
+ declaration_specifiers init_declarator_list(?) ';'
+ {
+ if($::opt_DECLARATIONS)
+ {
+ $::declarations_output .= ::flatten_list($item[1]);
+ $::declarations_output .= ::flatten_list($item[2]);
+ $::declarations_output .= ::flatten_list($item[3]) . "\n";
+ }
+ }
+
+ declaration_list:
+ declaration(s)
+
+ declaration_specifiers:
+ type_qualifier declaration_specifiers(?)
+ | storage_class_specifier declaration_specifiers(?)
+ | type_specifier declaration_specifiers(?)
+
+ storage_class_specifier:
+ 'auto'
+ | 'register'
+ | 'static'
+ | 'extern'
+ | 'typedef'
+
+ type_specifier:
+ 'int'
+ | 'double'
+ | 'void'
+ | 'char'
+ | 'long'
+ | 'float'
+ | 'signed'
+ | 'unsigned'
+ | 'short'
+ | struct_or_union_specifier
+ | enum_specifier
+ | typedef_name ...typedef_name_lookahead { [$item[1] ] }
+
+ typedef_name_lookahead:
+ declarator
+# | pointer
+# | ',' ...parameter_type_list
+# | ')'
+
+ type_qualifier:
+ 'const'
+ | 'volatile'
+
+ struct_or_union_specifier:
+ struct_or_union IDENTIFIER(?) '{' struct_declaration_list(?) '}'
+ {
+ if($::opt_STRUCTS){
+ $::structs_output .= ::flatten_list($item[1]) . " ";
+ $::structs_output .= ::flatten_list($item[2]);
+ $::structs_output .= ::flatten_list($item[3]) . "\n";
+ $::structs_output .= ::flatten_list_beautified($item[4]);
+ $::structs_output .= ::flatten_list($item[5]) . ";\n\n";
+ }
+ }
+ | struct_or_union IDENTIFIER
+
+ struct_or_union:
+ 'struct'
+ | 'union'
+
+
+ struct_declaration_list:
+ struct_declaration(s)
+
+ init_declarator_list:
+ init_declarator(s /(,)/)
+
+ init_declarator:
+ declarator '=' initializer
+ | declarator
+
+ struct_declaration:
+ specifier_qualifier_list struct_declarator_list ';'
+
+ specifier_qualifier_list:
+ type_specifier specifier_qualifier_list(?)
+ | type_qualifier specifier_qualifier_list(?)
+
+ struct_declarator_list:
+ struct_declarator(s /(,)/)
+
+ struct_declarator:
+ declarator(?) ':' constant_expression
+ | declarator
+
+ enum_specifier:
+ 'enum' IDENTIFIER(?) '{' enumerator_list '}'
+ {
+ if($::opt_STRUCTS){
+ $::structs_output .= ::flatten_list($item[1]) . " ";
+ $::structs_output .= ::flatten_list($item[2]);
+ $::structs_output .= ::flatten_list($item[3]) . "\n";
+ $::structs_output .= ::flatten_list_beautified($item[4]);
+ $::structs_output .= ::flatten_list($item[5]) . ";\n\n";
+ }
+ }
+ | 'enum' IDENTIFIER
+
+ enumerator_list:
+ enumerator(s /(,)/)
+
+ enumerator:
+ IDENTIFIER ('=' constant_expression)(?)
+
+ declarator:
+ pointer(?) direct_declarator
+
+ function_signature:
+ '[' constant_expression(?) ']'
+ | '(' parameter_type_list ')'
+ | '(' identifier_list(?) ')'
+
+ direct_declarator:
+ IDENTIFIER function_signature(s?)
+ | '(' declarator ')' function_signature(s?)
+
+
+ pointer:
+ '*' type_qualifier_list(?) pointer(?)
+
+ type_qualifier_list:
+ type_qualifier(s)
+
+ parameter_type_list:
+ parameter_list (',' '...')(?)
+
+ parameter_list:
+ parameter_declaration(s /(,)/)
+
+ parameter_declaration:
+ declaration_specifiers declarator
+ | declaration_specifiers abstract_declarator(?)
+
+ identifier_list:
+ IDENTIFIER(s /(,)/)
+
+ initializer:
+ assignment_expression
+ | '{' initializer_list (',')(?) '}'
+
+ initializer_list:
+ initializer(s /(,)/)
+
+ type_name:
+ specifier_qualifier_list abstract_declarator(?)
+
+ abstract_declarator:
+ pointer(?) direct_abstract_declarator
+ | pointer
+
+ abstract_type:
+ '[' constant_expression(?) ']'
+ | '(' parameter_type_list(?) ')'
+
+ direct_abstract_declarator:
+ '(' abstract_declarator ')' abstract_type(s?)
+ | abstract_type(s)
+
+ typedef_name:
+ IDENTIFIER
+
+ statement:
+ selection_statement
+ | expression_statement
+ | iteration_statement
+ | compound_statement
+ | jump_statement
+ | labeled_statement
+
+
+ labeled_statement:
+ 'case' constant_expression ':' statement
+ | IDENTIFIER ':' statement
+ | 'default' ':' statement
+
+ expression_statement:
+ expression(?) ';'
+
+ compound_statement:
+ '{' declaration_list(?) statement_list(?) '}'
+
+ statement_list:
+ statement(s)
+
+ selection_statement:
+ 'if' '(' expression ')' statement ('else' statement)(?)
+ | 'switch' '(' expression ')' statement
+
+ iteration_statement:
+ 'for' '(' expression(?) ';' expression(?) ';' expression(?) ')' statement
+ | 'while' '(' expression ')' statement
+ | 'do' statement 'while' '(' expression ')'
+
+ jump_statement:
+ 'return' expression(?) ';'
+ | 'break' ';'
+ | 'continue' ';'
+ | 'goto' IDENTIFIER ';'
+
+ expression:
+ assignment_expression(s /(,)/)
+
+ assignment_expression:
+ unary_expression ASSIGNMENT_OPERATOR assignment_expression
+ | conditional_expression
+
+
+ conditional_expression:
+ logical_OR_expression ('?' expression ':' conditional_expression)(?)
+
+ constant_expression:
+ conditional_expression
+
+ logical_OR_expression:
+ logical_AND_expression(s /(\|\|)/)
+
+ logical_AND_expression:
+ inclusive_OR_expression(s /(&&)/)
+
+ inclusive_OR_expression:
+ exclusive_OR_expression(s /(\|)/)
+
+ exclusive_OR_expression:
+ AND_expression(s /(\^)/)
+
+ AND_expression:
+ equality_expression(s /(&)/)
+
+ equality_expression:
+ relational_expression(s /(==|!=)/)
+
+ relational_expression:
+ shift_expression(s /(<=|>=|<|>)/)
+
+ shift_expression:
+ additive_expression(s /(<<|>>)/)
+
+ additive_expression:
+ multiplicative_expression(s /(\+|-)/)
+
+ multiplicative_expression:
+ cast_expression(s /(\*|\/|%)/)
+
+ cast_expression:
+ unary_expression
+ | '(' type_name ')' cast_expression
+
+ unary_expression:
+ postfix_expression
+ | '++' unary_expression
+ | '--' unary_expression
+ | 'sizeof' '(' type_name ')'
+ | UNARY_OPERATOR cast_expression
+ | 'sizeof' unary_expression
+
+
+ postfix_expression:
+ primary_expression postfix_expression_token(s?)
+
+
+ postfix_expression_token:
+ '[' expression ']'
+ | '(' argument_expression_list(?)')'
+ | '.' IDENTIFIER
+ | '->' IDENTIFIER
+ | '++'
+ | '--'
+
+
+ primary_expression:
+ IDENTIFIER
+ | constant
+ | STRING
+ | '(' expression ')'
+
+ argument_expression_list:
+ assignment_expression(s /(,)/)
+
+ constant:
+ CHARACTER_CONSTANT
+ | FLOATING_CONSTANT
+ | INTEGER_CONSTANT
+ | ENUMERATION_CONSTANT
+
+
+### TERMINALS
+
+
+ INTEGER_CONSTANT:
+ /(?:0[xX][\da-fA-F]+) # Hexadecimal
+ |(?:0[0-7]*) # Octal or Zero
+ |(?:[1-9]\d*) # Decimal
+ [uUlL]? # Suffix
+ /x
+
+ CHARACTER_CONSTANT:
+ /'([^\\'"] # None of these
+ |\\['\\ntvbrfa'"] # or a backslash followed by one of those
+ |\\[0-7]{1,3}|\\x\d+)' # or an octal or hex constant
+ /x
+
+ FLOATING_CONSTANT:
+ /(?:\d+|(?=\.\d+)) # No leading digits only if '.moreDigits' follows
+ (?:\.|(?=[eE])) # There may be no floating point only if an exponent is present
+ \d* # Zero or more floating digits
+ ([eE][+-]?\d+)? # expontent
+ [lLfF]? # Suffix
+ /x
+
+ ENUMERATION_CONSTANT:
+ INTEGER_CONSTANT
+
+ STRING:
+ /"(([^\\'"]) # None of these
+ |(\\[\\ntvbrfa'"]) # or a backslash followed by one of those
+ |(\\[0-7]{1,3})|(\\x\d+))*"/x # or an octal or hex
+
+ IDENTIFIER:
+ /(?!(auto|break|case|char|const|continue|default|do|double|else|enum|extern|float|for|goto # LOOKAHEAD FOR KEYWORDS
+ |if|int|long|register|return|signed|sizeof|short|static|struct|switch|typedef # NONE OF THE KEYWORDS
+ |union|unsigned|void|volatile|while)[^a-zA-Z_]) # SHOULD FULLY MATCH!
+ (([a-zA-Z]\w*)|(_\w+))/x # Check for valid identifier
+
+ ASSIGNMENT_OPERATOR:
+ '=' | '*=' | '/=' | '%=' | '+=' | '-=' | '<<=' | '>>=' | '&=' | '^=' | '|='
+
+ UNARY_OPERATOR:
+ '&' | '*' | '+' | '-' | '~' | '!'
+
+EOGRAMMAR
+
+
+# Create the reference output
+my $class = "TestParser";
+
+sub CompileParser {
+ my $pm_filename = $class . '.pm';
+
+ eval {
+ Parse::RecDescent->Precompile({-standalone => 1,},
+ $grammar,
+ $class);
+ };
+ ok(!$@, qq{created a precompiled parser: } . $@);
+ ok(-e $pm_filename, "found the precompiled parser file");
+
+ my $fh;
+ ok((open $fh, '<', $pm_filename), "opened the precompiled parser");
+ my $parser_text;
+
+ local $/;
+ $parser_text = <$fh>;
+ close $fh;
+
+ ok((defined($parser_text) and length($parser_text)),
+ "parser contains data");
+
+ unlink $pm_filename;
+ ok(!-e $pm_filename, "deleted precompiled parser");
+
+ return $parser_text;
+}
+
+my $reference_parser = CompileParser();
+
+for (0..5) {
+ my $new_parser = CompileParser($_);
+
+ ok($new_parser eq $reference_parser, "parsers match");
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Parse-RecDescent-1.967009/t/skip.t new/Parse-RecDescent-1.967012/t/skip.t
--- old/Parse-RecDescent-1.967009/t/skip.t 2012-02-19 20:53:32.000000000 +0100
+++ new/Parse-RecDescent-1.967012/t/skip.t 2015-09-13 02:44:06.000000000 +0200
@@ -24,7 +24,7 @@
# Test setting the initial skip via the <skip:> global directive
RunTests(q{
-<skip:(?mxs: \s+ |\# .*?$)*>
+<skip:'(?mxs: \s+ |\# .*?$)*'>
});
# Test setting the initial skip via $Parse::RecDescent::skip global
++++++ cpanspec.yml ++++++
---
#description_paragraphs: 3
#no_testing: broken upstream
#sources:
# - source1
# - source2
#patches:
# foo.patch: -p1
# bar.patch:
#preamble: |-
# BuildRequires: gcc-c++
#post_prep: |-
# hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'`
# sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL
#post_install: |-
# sed on %{name}.files
#license: SUSE-NonFree
#skip_noarch: 1
#custom_build: |-
#./Build build flags=%{?_smp_mflags} --myflag
#custom_test: |-
#startserver && make test
#ignore_requires: Bizarre::Module
1
0
Hello community,
here is the log from the commit of package Mesa for openSUSE:Factory checked in at 2015-09-24 06:13:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/Mesa (Old)
and /work/SRC/openSUSE:Factory/.Mesa.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Mesa"
Changes:
--------
--- /work/SRC/openSUSE:Factory/Mesa/Mesa.changes 2015-09-11 09:03:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.Mesa.new/Mesa.changes 2015-09-24 06:13:09.000000000 +0200
@@ -1,0 +2,31 @@
+Mon Sep 14 15:40:22 UTC 2015 - jslaby(a)suse.com
+
+- add n_i965-Remove-early-release-of-DRI2-miptree.patch (bnc#945444)
+
+-------------------------------------------------------------------
+Mon Sep 14 07:49:02 UTC 2015 - sndirsch(a)suse.com
+
+- marked Mesa.keyring and mesa-11.0.0.tar.xz.sig as source in
+ specfile in order to make factory checkin policy happy
+
+-------------------------------------------------------------------
+Sat Sep 12 15:36:35 UTC 2015 - mimi.vx(a)gmail.com
+
+- Update to version 11.0.0
+* Mesa 11.0 brings core Mesa support for OpenGL 4.2, RadeonSI and Nouveau NVC0
+ OpenGL 4.1 support (the other hardware drivers remain at OpenGL 3.3), AMDGPU
+ kernel driver support along with initial R9 Fury/Fiji support, EGL 1.5 support,
+ ongoing OpenGL ES 3.1 work, OpenCL compute image support, HEVC video decode
+ support for RadeonSI via VDPAU, OpenGL ES 3.0 for Freedreno, and many fixes.
++ drop U_mesa-llvm37-rename-r600-to-amdgpu.patch and U_mesa-llvm37.patch
+
+-------------------------------------------------------------------
+Fri Sep 11 18:00:38 UTC 2015 - mimi.vx(a)gmail.com
+
+- Update to version 10.6.7
++ add gpg verification of source package
+* fdo#90751 Revert "i965: Momentarily pretend to support
+ ARB_texture_stencil8 for blits."
+* mesa/teximage: use correct extension for accept stencil texture.
+
+-------------------------------------------------------------------
Old:
----
U_mesa-llvm37-rename-r600-to-amdgpu.patch
U_mesa-llvm37.patch
mesa-10.6.6.tar.xz
New:
----
Mesa.keyring
mesa-11.0.0.tar.xz
mesa-11.0.0.tar.xz.sig
n_i965-Remove-early-release-of-DRI2-miptree.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ Mesa.spec ++++++
--- /var/tmp/diff_new_pack.w42IF4/_old 2015-09-24 06:13:10.000000000 +0200
+++ /var/tmp/diff_new_pack.w42IF4/_new 2015-09-24 06:13:10.000000000 +0200
@@ -18,7 +18,7 @@
%define glamor 1
%define _name_archive mesa
-%define _version 10.6.6
+%define _version 11.0.0
%ifarch %ix86 x86_64 %arm ppc ppc64 ppc64le s390x
%define gallium_loader 1
%else
@@ -37,29 +37,30 @@
%define with_nine 1
%endif
Name: Mesa
-Version: 10.6.6
+Version: 11.0.0
Release: 0
Summary: System for rendering interactive 3-D graphics
License: MIT
Group: System/Libraries
Url: http://www.mesa3d.org
Source: ftp://ftp.freedesktop.org/pub/mesa/%{_version}/%{_name_archive}-%{_version}…
+Source1: ftp://ftp.freedesktop.org/pub/mesa/%{_version}/%{_name_archive}-%{_version}…
Source2: baselibs.conf
Source3: README.updates
Source4: manual-pages.tar.bz2
Source6: %{name}-rpmlintrc
+Source7: Mesa.keyring
# required for building against wayland of openSUSE 13.1
Patch0: n_Fixed-build-against-wayland-1.2.1.patch
+# should be replaced by real patch in X+Mesa+Intel ddx
+# this is only a workaround
+Patch1: n_i965-Remove-early-release-of-DRI2-miptree.patch
# to be upstreamed
Patch11: u_Fix-crash-in-swrast-when-setting-a-texture-for-a-pix.patch
# Patch from Fedora, fix 16bpp in llvmpipe
Patch13: u_mesa-8.0.1-fix-16bpp.patch
# Patch from Fedora, use shmget when available, under llvmpipe
Patch15: u_mesa-8.0-llvmpipe-shmget.patch
-# Upstream commit to fix build with llvm 3.7
-Patch16: U_mesa-llvm37.patch
-# Upstream commit to fix build with llvm 3.7
-Patch17: U_mesa-llvm37-rename-r600-to-amdgpu.patch
BuildRequires: autoconf >= 2.60
BuildRequires: automake
BuildRequires: bison
@@ -76,8 +77,9 @@
BuildRequires: pkgconfig(dri3proto)
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(glproto)
-BuildRequires: pkgconfig(libdrm) >= 2.4.38
-BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.41
+BuildRequires: pkgconfig(libdrm) >= 2.4.60
+BuildRequires: pkgconfig(libdrm_amdgpu) >= 2.4.63
+BuildRequires: pkgconfig(libdrm_nouveau) >= 2.4.62
BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.56
BuildRequires: pkgconfig(libkms) >= 1.0.0
BuildRequires: pkgconfig(libudev) > 151
@@ -109,11 +111,11 @@
Obsoletes: xorg-x11-Mesa < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%ifarch %arm
-BuildRequires: pkgconfig(libdrm_freedreno) >= 2.4.57
+BuildRequires: pkgconfig(libdrm_freedreno) >= 2.4.64
%endif
%ifarch x86_64 %ix86
BuildRequires: libelf-devel
-BuildRequires: pkgconfig(libdrm_intel) >= 2.4.60
+BuildRequires: pkgconfig(libdrm_intel) >= 2.4.61
%endif
%if 0%{?suse_version} >= 1310
BuildRequires: pkgconfig(wayland-client)
@@ -519,8 +521,7 @@
# required for building against wayland of openSUSE 13.1
%patch0 -p1
%endif
-%patch16 -p1
-%patch17 -p1
+%patch1 -p1
### disabled, but not dropped yet; these still need investigation in
### order to figure out whether the issue is still reproducable and
### hence a fix is required
++++++ mesa-10.6.6.tar.xz -> mesa-11.0.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/Mesa/mesa-10.6.6.tar.xz /work/SRC/openSUSE:Factory/.Mesa.new/mesa-11.0.0.tar.xz differ: char 26, line 1
++++++ n_i965-Remove-early-release-of-DRI2-miptree.patch ++++++
>From e2a696a4cd93c2dbe445243de48ed478fbdb8009 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris(a)chris-wilson.co.uk>
Date: Fri, 10 Jul 2015 10:41:35 +0100
Subject: i965: Remove early release of DRI2 miptree
References: bfo#86281 bko#349519
intel_update_winsys_renderbuffer_miptree() will release the existing
miptree when wrapping a new DRI2 buffer, so we can remove the early
release and so prevent a NULL mt dereference should importing the new
DRI2 name fail for any reason. (Reusing the old DRI2 name will result
in the rendering going astray, to a stale buffer, and not shown on the
screen, but it allows us to issue a warning and not crash much later in
innocent code.)
Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk>
---
src/mesa/drivers/dri/i965/brw_context.c | 1 -
1 file changed, 1 deletion(-)
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -1417,7 +1417,6 @@ intel_process_dri2_buffer(struct brw_con
buffer->cpp, buffer->pitch);
}
- intel_miptree_release(&rb->mt);
bo = drm_intel_bo_gem_create_from_name(brw->bufmgr, buffer_name,
buffer->name);
if (!bo) {
1
0
Hello community,
here is the log from the commit of package vim for openSUSE:Factory checked in at 2015-09-24 06:13:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vim (Old)
and /work/SRC/openSUSE:Factory/.vim.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vim"
Changes:
--------
--- /work/SRC/openSUSE:Factory/vim/vim.changes 2015-09-03 18:05:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.vim.new/vim.changes 2015-09-24 06:13:05.000000000 +0200
@@ -1,0 +2,14 @@
+Mon Sep 14 13:20:02 UTC 2015 - idonmez(a)suse.com
+
+- Updated to revision 865, fixes the following problems
+ * GTK: font glitches for combining characters
+ * "zt" still doesn't work well with filler lines. (Gary Johnson)
+ * Dragging the current tab with the mouse doesn't work properly.
+ * It's a bit clumsy to execute a command on a list of matches.
+ * Vim doesn't recognize all htmldjango files.
+ * Filetype detection is outdated.
+ * pango_shape_full() is not always available.
+ * Still problems with pango_shape_full() not available.
+ * plines_nofill() used without the diff feature.
+
+-------------------------------------------------------------------
Old:
----
v7.4.854.tar.gz
New:
----
v7.4.865.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vim.spec ++++++
--- /var/tmp/diff_new_pack.wnmz74/_old 2015-09-24 06:13:07.000000000 +0200
+++ /var/tmp/diff_new_pack.wnmz74/_new 2015-09-24 06:13:07.000000000 +0200
@@ -17,7 +17,7 @@
%define pkg_version 7.4
-%define patchlevel 854
+%define patchlevel 865
%define VIM_SUBDIR vim74
%define site_runtimepath /usr/share/vim/site
%define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?_smp_mflags}
++++++ v7.4.854.tar.gz -> v7.4.865.tar.gz ++++++
/work/SRC/openSUSE:Factory/vim/v7.4.854.tar.gz /work/SRC/openSUSE:Factory/.vim.new/v7.4.865.tar.gz differ: char 13, line 1
1
0
Hello community,
here is the log from the commit of package intel-gpu-tools for openSUSE:Factory checked in at 2015-09-24 06:12:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/intel-gpu-tools (Old)
and /work/SRC/openSUSE:Factory/.intel-gpu-tools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "intel-gpu-tools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/intel-gpu-tools/intel-gpu-tools.changes 2015-06-17 16:15:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.intel-gpu-tools.new/intel-gpu-tools.changes 2015-09-24 06:13:00.000000000 +0200
@@ -1,0 +2,21 @@
+Mon Sep 14 10:50:03 UTC 2015 - sndirsch(a)suse.com
+
+- intel-gpu-tools 1.12
+ - Various new tests and tools
+ - New statistical analysis functions. (Damien Lespiau)
+ - New benchmark tests. (Chris Wilson)
+ - Old register tools that were superseded by intel_reg have been removed.
+ - Various tests have been marked "basic", to indicate they are suitable for
+ use in basic acceptance testing. (Jesse Barnes)
+ - Per-ring gem_storedw_loop tests combined into a single test with subtests.
+ (Jesse Barnes)
+ - New "aubdump" tool, used to launch an application and capture rendering to
+ an AUB file. (Kristian Høgsberg Kristensen)
+ - Cherryview support added to intel_display_poller. (Ville Syrjälä)
+ - Skylake and Broadwell support added to gem_gpgpu_fill tests.
+ (Dominik Zeromski)
+ - Support for running core drm tests on any platform. (Micah Fedke)
+ - Many other bug fixes
+- supersedes patch 'u_build-fixes.patch"
+
+-------------------------------------------------------------------
Old:
----
intel-gpu-tools-1.11.tar.bz2
u_build-fixes.patch
New:
----
intel-gpu-tools-1.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ intel-gpu-tools.spec ++++++
--- /var/tmp/diff_new_pack.bxE4UM/_old 2015-09-24 06:13:01.000000000 +0200
+++ /var/tmp/diff_new_pack.bxE4UM/_new 2015-09-24 06:13:01.000000000 +0200
@@ -17,7 +17,7 @@
Name: intel-gpu-tools
-Version: 1.11
+Version: 1.12
Release: 0
Summary: Collection of tools for development and testing of the Intel DRM driver
License: MIT
@@ -25,7 +25,6 @@
Url: http://xorg.freedesktop.org/
Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.…
Patch0: n_disable-build-of-pm_rpm.patch
-Patch1: u_build-fixes.patch
Patch2: u_%{name}-1.7-fix-bashisms.patch
BuildRequires: i2c-tools
BuildRequires: libtool
@@ -54,7 +53,6 @@
%prep
%setup -q -n %{name}-%{version}
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%build
@@ -64,21 +62,18 @@
%install
%make_install
+rm $RPM_BUILD_ROOT/%{_libdir}/intel_aubdump.la
%files
%defattr(-,root,root)
%doc README
%doc COPYING
-%exclude %{_libdir}/I915ChipsetPython.la
-%exclude %{_libdir}/I915ChipsetPython.so
-# don't know hot to fix build differently!?!
-%exclude /usr/lib/debug/usr/%{_lib}/I915ChipsetPython.so.debug
-%exclude /usr/lib/debug/.build-id
%dir %{_datadir}/gtk-doc/html/%{name}
%{_datadir}/gtk-doc/html/%{name}/*
%{_bindir}/*
%{_mandir}/man*/*
%{_libexecdir}/intel-gpu-tools/
%{_datadir}/intel-gpu-tools/
+%{_libdir}/intel_aubdump.so
%changelog
++++++ intel-gpu-tools-1.11.tar.bz2 -> intel-gpu-tools-1.12.tar.bz2 ++++++
++++ 73103 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package xf86-video-intel for openSUSE:Factory checked in at 2015-09-24 06:12:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-intel (Old)
and /work/SRC/openSUSE:Factory/.xf86-video-intel.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-intel"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-intel/xf86-video-intel.changes 2015-08-21 07:36:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xf86-video-intel.new/xf86-video-intel.changes 2015-09-24 06:12:56.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Sep 11 13:52:33 UTC 2015 - tobias.johannes.klausmann(a)mni.thm.de
+
+ - Fix build against upcoming X-Server 1.18:
+ + Add missing required package xfont
+ + Add U_uxa_fix_the_call_to_PixmapSyncDirtyHelper_broken_by_xservers_90db5ed.patch
+
+-------------------------------------------------------------------
New:
----
U_uxa_fix_the_call_to_PixmapSyncDirtyHelper_broken_by_xservers_90db5ed.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-video-intel.spec ++++++
--- /var/tmp/diff_new_pack.KurwLd/_old 2015-09-24 06:12:57.000000000 +0200
+++ /var/tmp/diff_new_pack.KurwLd/_new 2015-09-24 06:12:57.000000000 +0200
@@ -35,7 +35,7 @@
Patch0: U_sna-Protect-against-ABI-breakage-in-recent-versions-.patch
Patch1: u_sna-fix-missing-includes-for-fstat.patch
Patch2: u_uxa-fix-missing-includes-for-fstat.patch
-
+Patch10: U_uxa_fix_the_call_to_PixmapSyncDirtyHelper_broken_by_xservers_90db5ed.patch
%if %glamor
Requires: glamor
%endif
@@ -66,6 +66,7 @@
BuildRequires: pkgconfig(xextproto)
BuildRequires: pkgconfig(xf86driproto)
BuildRequires: pkgconfig(xfixes)
+BuildRequires: pkgconfig(xfont)
BuildRequires: pkgconfig(xinerama)
BuildRequires: pkgconfig(xorg-macros) >= 1.8
BuildRequires: pkgconfig(xorg-server) >= 1.0.99.901
@@ -108,6 +109,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch10 -p1
%build
### --enable-dri3 \
++++++ U_uxa_fix_the_call_to_PixmapSyncDirtyHelper_broken_by_xservers_90db5ed.patch ++++++
>From 2c5063938cc809f624e56efd4673041fa8141e81 Mon Sep 17 00:00:00 2001
From: Martin Peres <martin.peres(a)linux.intel.com>
Date: Thu, 9 Jul 2015 11:26:38 +0300
Subject: uxa: fix the call to PixmapSyncDirtyHelper, broken by xserver's
90db5ed
[ickle: switch to HAS_DIRTYTRACKING_ROTATION as suggested by Dave Airlie]
Signed-off-by: Martin Peres <martin.peres(a)linux.intel.com>
diff --git a/src/compat-api.h b/src/compat-api.h
index aa93bee..293e9d7 100644
--- a/src/compat-api.h
+++ b/src/compat-api.h
@@ -247,3 +247,7 @@ static inline void FreePixmap(PixmapPtr pixmap)
#endif
#endif
+
+#if HAS_DIRTYTRACKING_ROTATION
+#define PixmapSyncDirtyHelper(d, dd) PixmapSyncDirtyHelper(d)
+#endif
--
cgit v0.10.2
1
0
Hello community,
here is the log from the commit of package libXi for openSUSE:Factory checked in at 2015-09-24 06:12:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libXi (Old)
and /work/SRC/openSUSE:Factory/.libXi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libXi"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libXi/libXi.changes 2014-07-21 10:35:29.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libXi.new/libXi.changes 2015-09-24 06:12:50.000000000 +0200
@@ -1,0 +2,16 @@
+Fri Sep 11 12:09:30 UTC 2015 - tobias.johannes.klausmann(a)mni.thm.de
+
+- Update to version 1.7.5:
+ A couple of important bugfixes that have accumulated over the last
+ year.
+ + Fix version check in _XIAllowEvents
+ + Advance the request buffer by the right amount in XIChangeHierarchy
+ + Fix double unlock when _XiCheckExtInit return -1.
+ + XIChangeHierarchy: Add missing unlock.
+ + Do not return NoSuchExtension casted to pointer as an error.
+ + XIGetClientPointer: Return False on error.
+ + Fix logic in _XIAllowEvents and prevent double unlock.
+ + Refactor XGetExtensionVersion.
+ + XIGrabDevice: Unlock display in error path.
+
+-------------------------------------------------------------------
Old:
----
libXi-1.7.4.tar.bz2
New:
----
libXi-1.7.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libXi.spec ++++++
--- /var/tmp/diff_new_pack.OHvFHe/_old 2015-09-24 06:12:51.000000000 +0200
+++ /var/tmp/diff_new_pack.OHvFHe/_new 2015-09-24 06:12:51.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libXi
#
-# Copyright (c) 2014 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
@@ -18,7 +18,7 @@
Name: libXi
%define lname libXi6
-Version: 1.7.4
+Version: 1.7.5
Release: 0
Summary: X Input Extension library
License: MIT
++++++ libXi-1.7.4.tar.bz2 -> libXi-1.7.5.tar.bz2 ++++++
++++ 4640 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/ChangeLog new/libXi-1.7.5/ChangeLog
--- old/libXi-1.7.4/ChangeLog 2014-07-18 08:47:15.000000000 +0200
+++ new/libXi-1.7.5/ChangeLog 2015-09-09 17:17:33.000000000 +0200
@@ -1,3 +1,122 @@
+commit f180dff710dc54d00e0e26b84de053151f8f207e
+Author: Peter Hutterer <peter.hutterer(a)who-t.net>
+Date: Thu Sep 10 01:16:19 2015 +1000
+
+ libXi 1.7.5
+
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit 05c86e53c0bae30e58b32b94e191c8720990918a
+Author: Cosimo Cecchi <cosimoc(a)gnome.org>
+Date: Tue Feb 24 07:49:34 2015 +1000
+
+ Fix version check in _XIAllowEvents
+
+ Commit 5810d0797160a97012664ffe719a59e1b288a525 changed _XIAllowEvents() to
+ use _XiCheckVersion() instead of _XiCheckExtInit() to avoid a double display
+ unlock, but it failed to correctly check for the version, since we should set
+ have_XI22 to True for every version greater or equal to 2.2.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit c648441036cf5ffc5225cd484e2c906d374f0a4b
+Author: Michal Srb <msrb(a)suse.com>
+Date: Mon Nov 3 12:43:40 2014 +0200
+
+ XIGrabDevice: Unlock display in error path.
+
+ Signed-off-by: Michal Srb <msrb(a)suse.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit 29c77457ad86966ae2204b865fb8b437269063c4
+Author: Michal Srb <msrb(a)suse.com>
+Date: Sat Nov 1 20:00:57 2014 +0200
+
+ Refactor XGetExtensionVersion.
+
+ _XiGetExtensionVersion was called from XGetExtensionVersion and from
+ _XiCheckExtInit. When called from _XiCheckExtInit, nothing accounted for the
+ fact that it can return ((XExtensionVersion *) NoSuchExtension) in case of
+ error. Also it recursively calls _XiCheckExtInit potentionally causing multiple
+ unlocks if _XiCheckExtInit fails.
+ -> Remove it and call directly _XiGetExtensionVersionRequest and only call
+ _XiCheckExtInit only from XGetExtensionVersion.
+
+ Signed-off-by: Michal Srb <msrb(a)suse.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit 5810d0797160a97012664ffe719a59e1b288a525
+Author: Michal Srb <msrb(a)suse.com>
+Date: Sat Nov 1 20:00:56 2014 +0200
+
+ Fix logic in _XIAllowEvents and prevent double unlock.
+
+ Replacing the second _XiCheckExtInit with _XiCheckVersion prevents possible
+ double unlock as _XiCheckExtInit actually unlocks the display when it returns
+ -1.
+
+ Signed-off-by: Michal Srb <msrb(a)suse.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit f699770e7c92da1dbf16892fde83438f0b79c979
+Author: Michal Srb <msrb(a)suse.com>
+Date: Sat Nov 1 20:00:54 2014 +0200
+
+ XIGetClientPointer: Return False on error.
+
+ Not NoSuchExtension which is 1 = True!
+
+ Signed-off-by: Michal Srb <msrb(a)suse.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit dc1f8c6ec1ba8135afa185c8e8360c1ed90bf96c
+Author: Michal Srb <msrb(a)suse.com>
+Date: Sat Nov 1 20:00:53 2014 +0200
+
+ Do not return NoSuchExtension casted to pointer as an error.
+
+ Several functions were returning NoSuchExtension casted to a pointer in case of
+ an error. Often in parallel with returning NULL in case of another error. It is
+ undocumented and certainly wrong.
+
+ Signed-off-by: Michal Srb <msrb(a)suse.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit 83261c52a17543437882e2863b7f06a92c9039f8
+Author: Michal Srb <msrb(a)suse.com>
+Date: Sat Nov 1 20:00:52 2014 +0200
+
+ XIChangeHierarchy: Add missing unlock.
+
+ When num_changes <= 0 or Xmalloc fails, the display has to be unlocked.
+
+ Signed-off-by: Michal Srb <msrb(a)suse.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit 22ae8d4f26e92b17e1ce8239a38481933d6f1ca7
+Author: Michal Srb <msrb(a)suse.com>
+Date: Sat Nov 1 20:00:51 2014 +0200
+
+ Fix double unlock when _XiCheckExtInit return -1.
+
+ _XiCheckExtInit unlocks the display if it fails and returns -1. Most callers
+ account for it properly, but few didn't.
+
+ Signed-off-by: Michal Srb <msrb(a)suse.com>
+ Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+
+commit 71a42145b678be623e30bd5bf55833a04f14376f
+Author: Julien Cristau <jcristau(a)debian.org>
+Date: Mon Oct 27 19:00:36 2014 +0100
+
+ Advance the request buffer by the right amount in XIChangeHierarchy
+
+ c->length is in 4-byte units, dptr is a char *, so we need to advance
+ dptr by 4 * length to get the position of the next HierarchyChangeInfo.
+
+ Reviewed-by: Peter Hutterer <peter.hutterer(a)who-t.net>
+ Signed-off-by: Julien Cristau <jcristau(a)debian.org>
+
commit 8c255b30f3a4ed8bf67e6bb76df47cbd480735f8
Author: Peter Hutterer <peter.hutterer(a)who-t.net>
Date: Fri Jul 18 16:45:51 2014 +1000
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/compile new/libXi-1.7.5/compile
--- old/libXi-1.7.4/compile 1970-01-01 01:00:00.000000000 +0100
+++ new/libXi-1.7.5/compile 2015-09-09 17:15:28.000000000 +0200
@@ -0,0 +1,347 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-10-14.11; # UTC
+
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey(a)cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake(a)gnu.org> or send patches to
+# <automake-patches(a)gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" "" $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine/*)
+ file=`winepath -w "$file" || echo "$file"`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+ func_file_conv "$1"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+ lib=$1
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ lib=$dir/$lib.dll.lib
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ lib=$dir/$lib.lib
+ break
+ fi
+ if test -f "$dir/lib$lib.a"; then
+ found=yes
+ lib=$dir/lib$lib.a
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ if test "$found" != yes; then
+ lib=$lib.lib
+ fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ eat=1
+ case $2 in
+ *.o | *.[oO][bB][jJ])
+ func_file_conv "$2"
+ set x "$@" -Fo"$file"
+ shift
+ ;;
+ *)
+ func_file_conv "$2"
+ set x "$@" -Fe"$file"
+ shift
+ ;;
+ esac
+ ;;
+ -I)
+ eat=1
+ func_file_conv "$2" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -I*)
+ func_file_conv "${1#-I}" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -l)
+ eat=1
+ func_cl_dashl "$2"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -l*)
+ func_cl_dashl "${1#-l}"
+ set x "$@" "$lib"
+ shift
+ ;;
+ -L)
+ eat=1
+ func_cl_dashL "$2"
+ ;;
+ -L*)
+ func_cl_dashL "${1#-L}"
+ ;;
+ -static)
+ shared=false
+ ;;
+ -Wl,*)
+ arg=${1#-Wl,}
+ save_ifs="$IFS"; IFS=','
+ for flag in $arg; do
+ IFS="$save_ifs"
+ linker_opts="$linker_opts $flag"
+ done
+ IFS="$save_ifs"
+ ;;
+ -Xlinker)
+ eat=1
+ linker_opts="$linker_opts $2"
+ ;;
+ -*)
+ set x "$@" "$1"
+ shift
+ ;;
+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+ func_file_conv "$1"
+ set x "$@" -Tp"$file"
+ shift
+ ;;
+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+ func_file_conv "$1" mingw
+ set x "$@" "$file"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+ done
+ if test -n "$linker_opts"; then
+ linker_opts="-link$linker_opts"
+ fi
+ exec "$@" $linker_opts
+ exit 1
+}
+
+eat=
+
+case $1 in
+ '')
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake(a)gnu.org>.
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ # So we strip '-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no '-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # '.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/configure.ac new/libXi-1.7.5/configure.ac
--- old/libXi-1.7.4/configure.ac 2014-07-18 08:45:45.000000000 +0200
+++ new/libXi-1.7.5/configure.ac 2015-09-09 17:14:59.000000000 +0200
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXi], [1.7.4],
+AC_INIT([libXi], [1.7.5],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg] [libXi])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/missing new/libXi-1.7.5/missing
--- old/libXi-1.7.4/missing 2013-07-03 03:03:56.000000000 +0200
+++ new/libXi-1.7.5/missing 2015-09-09 17:15:28.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2012-06-26.16; # UTC
+scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -160,7 +160,7 @@
;;
autom4te*)
echo "You might have modified some maintainer files that require"
- echo "the 'automa4te' program to be rebuilt."
+ echo "the 'autom4te' program to be rebuilt."
program_details 'autom4te'
;;
bison*|yacc*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XExtInt.c new/libXi-1.7.5/src/XExtInt.c
--- old/libXi-1.7.4/src/XExtInt.c 2013-12-03 01:32:16.000000000 +0100
+++ new/libXi-1.7.5/src/XExtInt.c 2014-11-03 06:28:36.000000000 +0100
@@ -380,7 +380,7 @@
return (-1);
}
((XInputData *) info->data)->vers =
- _XiGetExtensionVersion(dpy, "XInputExtension", info);
+ _XiGetExtensionVersionRequest(dpy, "XInputExtension", info->codes->major_opcode);
}
if (_XiCheckVersion(info, version_index) < 0) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XGMotion.c new/libXi-1.7.5/src/XGMotion.c
--- old/libXi-1.7.4/src/XGMotion.c 2013-05-24 03:46:37.000000000 +0200
+++ new/libXi-1.7.5/src/XGMotion.c 2014-11-03 06:28:35.000000000 +0100
@@ -81,7 +81,7 @@
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((XDeviceTimeCoord *) NoSuchExtension);
+ return NULL;
GetReq(GetDeviceMotionEvents, req);
req->reqType = info->codes->major_opcode;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XGetCPtr.c new/libXi-1.7.5/src/XGetCPtr.c
--- old/libXi-1.7.4/src/XGetCPtr.c 2011-12-20 01:28:44.000000000 +0100
+++ new/libXi-1.7.5/src/XGetCPtr.c 2014-11-03 06:28:35.000000000 +0100
@@ -49,7 +49,7 @@
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, Dont_Check, info) == -1)
- return (NoSuchExtension);
+ return False;
GetReq(XIGetClientPointer, req);
req->reqType = info->codes->major_opcode;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XGetDCtl.c new/libXi-1.7.5/src/XGetDCtl.c
--- old/libXi-1.7.4/src/XGetDCtl.c 2013-06-26 21:37:18.000000000 +0200
+++ new/libXi-1.7.5/src/XGetDCtl.c 2014-11-03 06:28:35.000000000 +0100
@@ -79,7 +79,7 @@
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_Add_XChangeDeviceControl, info) == -1)
- return ((XDeviceControl *) NoSuchExtension);
+ return NULL;
GetReq(GetDeviceControl, req);
req->reqType = info->codes->major_opcode;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XGetFCtl.c new/libXi-1.7.5/src/XGetFCtl.c
--- old/libXi-1.7.4/src/XGetFCtl.c 2013-06-27 22:07:18.000000000 +0200
+++ new/libXi-1.7.5/src/XGetFCtl.c 2014-11-03 06:28:35.000000000 +0100
@@ -79,7 +79,7 @@
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((XFeedbackState *) NoSuchExtension);
+ return NULL;
GetReq(GetFeedbackControl, req);
req->reqType = info->codes->major_opcode;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XGetKMap.c new/libXi-1.7.5/src/XGetKMap.c
--- old/libXi-1.7.4/src/XGetKMap.c 2013-05-24 03:46:37.000000000 +0200
+++ new/libXi-1.7.5/src/XGetKMap.c 2014-11-03 06:28:35.000000000 +0100
@@ -78,7 +78,7 @@
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((KeySym *) NoSuchExtension);
+ return NULL;
GetReq(GetDeviceKeyMapping, req);
req->reqType = info->codes->major_opcode;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XGetMMap.c new/libXi-1.7.5/src/XGetMMap.c
--- old/libXi-1.7.4/src/XGetMMap.c 2013-05-24 03:46:37.000000000 +0200
+++ new/libXi-1.7.5/src/XGetMMap.c 2014-11-03 06:28:35.000000000 +0100
@@ -73,7 +73,7 @@
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((XModifierKeymap *) NoSuchExtension);
+ return NULL;
GetReq(GetDeviceModifierMapping, req);
req->reqType = info->codes->major_opcode;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XGetProp.c new/libXi-1.7.5/src/XGetProp.c
--- old/libXi-1.7.4/src/XGetProp.c 2013-06-26 21:37:18.000000000 +0200
+++ new/libXi-1.7.5/src/XGetProp.c 2014-11-03 06:28:35.000000000 +0100
@@ -75,7 +75,7 @@
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((XEventClass *) NoSuchExtension);
+ return NULL;
GetReq(GetDeviceDontPropagateList, req);
req->reqType = info->codes->major_opcode;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XGetVers.c new/libXi-1.7.5/src/XGetVers.c
--- old/libXi-1.7.4/src/XGetVers.c 2011-12-20 01:28:44.000000000 +0100
+++ new/libXi-1.7.5/src/XGetVers.c 2014-11-03 06:28:36.000000000 +0100
@@ -68,12 +68,16 @@
XExtDisplayInfo *info = XInput_find_display(dpy);
LockDisplay(dpy);
- ext = _XiGetExtensionVersion(dpy, name, info);
- if (ext != (XExtensionVersion *) NoSuchExtension) {
- UnlockDisplay(dpy);
- SyncHandle();
- }
- return (ext);
+
+ if (_XiCheckExtInit(dpy, Dont_Check, info) == -1)
+ return NULL;
+
+ ext = _XiGetExtensionVersionRequest(dpy, name, info->codes->major_opcode);
+
+ UnlockDisplay(dpy);
+ SyncHandle();
+
+ return ext;
}
_X_HIDDEN XExtensionVersion*
@@ -91,7 +95,7 @@
_XSend(dpy, name, (long)req->nbytes);
if (!_XReply(dpy, (xReply *) & rep, 0, xTrue)) {
- return (XExtensionVersion *) NULL;
+ return NULL;
}
ext = (XExtensionVersion *) Xmalloc(sizeof(XExtensionVersion));
@@ -105,13 +109,3 @@
return ext;
}
-
-_X_HIDDEN XExtensionVersion *
-_XiGetExtensionVersion(register Display * dpy, _Xconst char *name,
- XExtDisplayInfo *info)
-{
- if (_XiCheckExtInit(dpy, Dont_Check, info) == -1)
- return ((XExtensionVersion *) NoSuchExtension);
-
- return _XiGetExtensionVersionRequest(dpy, name, info->codes->major_opcode);
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XIAllowEvents.c new/libXi-1.7.5/src/XIAllowEvents.c
--- old/libXi-1.7.4/src/XIAllowEvents.c 2014-07-14 00:45:18.000000000 +0200
+++ new/libXi-1.7.5/src/XIAllowEvents.c 2015-02-23 22:49:22.000000000 +0100
@@ -40,7 +40,7 @@
_XIAllowEvents(Display *dpy, int deviceid, int event_mode, Time time,
unsigned int touchid, Window grab_window)
{
- Bool have_XI22 = True;
+ Bool have_XI22 = False;
xXIAllowEventsReq *req;
xXI2_2AllowEventsReq *req_XI22;
@@ -50,7 +50,7 @@
if (_XiCheckExtInit(dpy, XInput_2_0, extinfo) == -1)
return (NoSuchExtension);
- if (_XiCheckExtInit(dpy, XInput_2_2, extinfo) == 0)
+ if (_XiCheckVersion(extinfo, XInput_2_2) >= 0)
have_XI22 = True;
if (have_XI22)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XIGrabDevice.c new/libXi-1.7.5/src/XIGrabDevice.c
--- old/libXi-1.7.4/src/XIGrabDevice.c 2013-06-26 22:24:43.000000000 +0200
+++ new/libXi-1.7.5/src/XIGrabDevice.c 2014-11-04 00:11:57.000000000 +0100
@@ -53,14 +53,20 @@
if (mask->mask_len > INT_MAX - 3 ||
(mask->mask_len + 3)/4 >= 0xffff)
- return BadValue;
+ {
+ reply.status = BadValue;
+ goto out;
+ }
/* mask->mask_len is in bytes, but we need 4-byte units on the wire,
* and they need to be padded with 0 */
len = (mask->mask_len + 3)/4;
buff = calloc(4, len);
if (!buff)
- return BadAlloc;
+ {
+ reply.status = BadAlloc;
+ goto out;
+ }
GetReq(XIGrabDevice, req);
req->reqType = extinfo->codes->major_opcode;
@@ -83,6 +89,7 @@
if (_XReply(dpy, (xReply *)&reply, 0, xTrue) == 0)
reply.status = GrabSuccess;
+out:
UnlockDisplay(dpy);
SyncHandle();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XIHierarchy.c new/libXi-1.7.5/src/XIHierarchy.c
--- old/libXi-1.7.4/src/XIHierarchy.c 2011-12-20 01:28:44.000000000 +0100
+++ new/libXi-1.7.5/src/XIHierarchy.c 2014-11-03 06:28:35.000000000 +0100
@@ -49,14 +49,14 @@
xXIChangeHierarchyReq *req;
XExtDisplayInfo *info = XInput_find_display(dpy);
char *data = NULL, *dptr;
- int dlen = 0, i;
+ int dlen = 0, i, ret = Success;
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_2_0, info) == -1)
return (NoSuchExtension);
if (num_changes <= 0)
- return Success;
+ goto out;
GetReq(XIChangeHierarchy, req);
req->reqType = info->codes->major_opcode;
@@ -91,8 +91,10 @@
req->length += dlen / 4; /* dlen is 4-byte aligned */
data = Xmalloc(dlen);
- if (!data)
- return BadAlloc;
+ if (!data) {
+ ret = BadAlloc;
+ goto out;
+ }
dptr = data;
for (i = 0, any = changes; i < num_changes; i++, any++)
@@ -109,7 +111,7 @@
c->name_len = strlen(C->name);
c->length = (sizeof(xXIAddMasterInfo) + c->name_len + 3)/4;
strncpy((char*)&c[1], C->name, c->name_len);
- dptr += c->length;
+ dptr += 4 * c->length;
}
break;
case XIRemoveMaster:
@@ -155,8 +157,10 @@
}
Data(dpy, data, dlen);
+
+out:
Xfree(data);
UnlockDisplay(dpy);
SyncHandle();
- return Success;
+ return ret;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XIProperties.c new/libXi-1.7.5/src/XIProperties.c
--- old/libXi-1.7.4/src/XIProperties.c 2013-05-24 03:46:37.000000000 +0200
+++ new/libXi-1.7.5/src/XIProperties.c 2014-11-03 06:28:35.000000000 +0100
@@ -51,7 +51,7 @@
LockDisplay(dpy);
*num_props_return = 0;
if (_XiCheckExtInit(dpy, XInput_2_0, info) == -1)
- goto cleanup;
+ goto cleanup_unlocked;
GetReq(XIListProperties, req);
req->reqType = info->codes->major_opcode;
@@ -76,6 +76,7 @@
cleanup:
UnlockDisplay(dpy);
+cleanup_unlocked:
SyncHandle();
return props;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XIQueryDevice.c new/libXi-1.7.5/src/XIQueryDevice.c
--- old/libXi-1.7.4/src/XIQueryDevice.c 2011-12-20 01:28:44.000000000 +0100
+++ new/libXi-1.7.5/src/XIQueryDevice.c 2014-11-03 06:28:35.000000000 +0100
@@ -50,7 +50,7 @@
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_2_0, extinfo) == -1)
- goto error;
+ goto error_unlocked;
GetReq(XIQueryDevice, req);
req->reqType = extinfo->codes->major_opcode;
@@ -105,6 +105,7 @@
error:
UnlockDisplay(dpy);
+error_unlocked:
SyncHandle();
*ndevices_return = -1;
return NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XIQueryVersion.c new/libXi-1.7.5/src/XIQueryVersion.c
--- old/libXi-1.7.4/src/XIQueryVersion.c 2013-05-27 01:14:05.000000000 +0200
+++ new/libXi-1.7.5/src/XIQueryVersion.c 2014-11-03 06:28:35.000000000 +0100
@@ -41,10 +41,8 @@
XExtDisplayInfo *info = XInput_find_display(dpy);
- LockDisplay(dpy);
rc = _xiQueryVersion(dpy, major_inout, minor_inout, info);
- UnlockDisplay(dpy);
SyncHandle();
return rc;
}
@@ -55,6 +53,8 @@
xXIQueryVersionReq *req;
xXIQueryVersionReply rep;
+ LockDisplay(dpy);
+
/* This could mean either a malloc problem, or supported
version < XInput_2_0 */
if (_XiCheckExtInit(dpy, XInput_2_0, info) == -1)
@@ -82,9 +82,13 @@
req->minor_version = *minor;
if (!_XReply(dpy, (xReply*)&rep, 0, xTrue)) {
+ UnlockDisplay(dpy);
return BadImplementation;
}
+
*major = rep.major_version;
*minor = rep.minor_version;
+
+ UnlockDisplay(dpy);
return Success;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XISelEv.c new/libXi-1.7.5/src/XISelEv.c
--- old/libXi-1.7.4/src/XISelEv.c 2013-06-26 21:37:18.000000000 +0200
+++ new/libXi-1.7.5/src/XISelEv.c 2014-11-03 06:28:35.000000000 +0100
@@ -60,7 +60,7 @@
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_2_0, info) == -1) {
r = NoSuchExtension;
- goto out;
+ goto out_unlocked;
}
for (i = 0; i < num_masks; i++) {
@@ -114,6 +114,7 @@
free(buff);
out:
UnlockDisplay(dpy);
+out_unlocked:
SyncHandle();
return r;
@@ -134,7 +135,7 @@
*num_masks_return = -1;
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_2_0, info) == -1)
- goto out;
+ goto out_unlocked;
GetReq(XIGetSelectedEvents, req);
@@ -209,6 +210,8 @@
Xfree(mask_in);
UnlockDisplay(dpy);
+
+out_unlocked:
SyncHandle();
return mask_out;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XIint.h new/libXi-1.7.5/src/XIint.h
--- old/libXi-1.7.4/src/XIint.h 2013-11-25 01:18:55.000000000 +0100
+++ new/libXi-1.7.5/src/XIint.h 2014-11-03 06:28:36.000000000 +0100
@@ -29,7 +29,6 @@
extern int _XiCheckExtInit(Display *, int, XExtDisplayInfo *);
extern int _XiCheckVersion(XExtDisplayInfo *info, int version_index);
-extern XExtensionVersion *_XiGetExtensionVersion(Display *, _Xconst char *, XExtDisplayInfo *);
extern XExtensionVersion* _XiGetExtensionVersionRequest(Display *dpy, _Xconst char *name, int xi_opcode);
extern Status _xiQueryVersion(Display *dpy, int*, int*, XExtDisplayInfo *);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XListDProp.c new/libXi-1.7.5/src/XListDProp.c
--- old/libXi-1.7.4/src/XListDProp.c 2013-05-24 03:46:37.000000000 +0200
+++ new/libXi-1.7.5/src/XListDProp.c 2014-11-03 06:28:35.000000000 +0100
@@ -51,7 +51,7 @@
LockDisplay(dpy);
*nprops_return = 0;
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- goto cleanup;
+ return NULL;
GetReq(ListDeviceProperties, req);
req->reqType = info->codes->major_opcode;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XOpenDev.c new/libXi-1.7.5/src/XOpenDev.c
--- old/libXi-1.7.4/src/XOpenDev.c 2013-05-24 03:46:37.000000000 +0200
+++ new/libXi-1.7.5/src/XOpenDev.c 2014-11-03 06:28:35.000000000 +0100
@@ -73,7 +73,7 @@
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((XDevice *) NoSuchExtension);
+ return NULL;
GetReq(OpenDevice, req);
req->reqType = info->codes->major_opcode;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.7.4/src/XQueryDv.c new/libXi-1.7.5/src/XQueryDv.c
--- old/libXi-1.7.4/src/XQueryDv.c 2013-05-24 03:46:37.000000000 +0200
+++ new/libXi-1.7.5/src/XQueryDv.c 2014-11-03 06:28:35.000000000 +0100
@@ -78,7 +78,7 @@
LockDisplay(dpy);
if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
- return ((XDeviceState *) NoSuchExtension);
+ return NULL;
GetReq(QueryDeviceState, req);
req->reqType = info->codes->major_opcode;
1
0
Hello community,
here is the log from the commit of package qt3 for openSUSE:Factory checked in at 2015-09-24 06:12:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt3 (Old)
and /work/SRC/openSUSE:Factory/.qt3.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt3"
Changes:
--------
qt3-extensions.changes: same change
--- /work/SRC/openSUSE:Factory/qt3/qt3.changes 2015-07-20 15:13:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.qt3.new/qt3.changes 2015-09-24 06:12:46.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Sep 14 02:03:53 UTC 2015 - anixx(a)opensuse.org
+
+- Further fix to iconview widget. Patch from Trinity
+ qt3-trinity-fix-iconview-widget2.patch
+
+-------------------------------------------------------------------
New:
----
qt3-trinity-fix-iconview-widget2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
qt3-extensions.spec: same change
++++++ qt3.spec ++++++
--- /var/tmp/diff_new_pack.yRGNdP/_old 2015-09-24 06:12:48.000000000 +0200
+++ /var/tmp/diff_new_pack.yRGNdP/_new 2015-09-24 06:12:48.000000000 +0200
@@ -130,6 +130,7 @@
Patch190: qt-x11-free-3.3.8b-CVE-2015-0295.patch
Patch191: qt-x11-free-3.3.8b-CVE-2015-1860.patch
Patch192: qt3-trinity-fix-iconview-widget.patch
+Patch193: qt3-trinity-fix-iconview-widget2.patch
# TQt integration
Patch200: qt-3.3.8c.diff
@@ -232,6 +233,7 @@
%patch190 -p1
%patch191 -p1
%patch192 -p1
+%patch193 -p1
# copy qt kde integration files
cp %SOURCE100 %SOURCE101 src/kernel/
++++++ qt3-trinity-fix-iconview-widget2.patch ++++++
>From d27f4e2fc304208a404c64279a4e32b1a94b05a9 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro(a)yahoo.it>
Date: Mon, 07 Sep 2015 14:58:02 +0000
Subject: Fixed (again) search algorithm for iconview widget. This resolves (again) bug 420.
Signed-off-by: Michele Calgaro <michele.calgaro(a)yahoo.it>
---
diff --git a/src/iconview/qiconview.cpp b/src/iconview/qiconview.cpp
index 790302a..e2a00bb 100644
--- a/src/iconview/qiconview.cpp
+++ b/src/iconview/qiconview.cpp
@@ -5313,23 +5313,21 @@ void QIconView::keyPressEvent( QKeyEvent *e )
/*
Finds the closest item in the direction \a dir starting from the specified \a fromItem.
- If the arrangement is LeftToRight (icon view mode): use center as item reference
- If the arrangement is TopToBottom (multicolumn view mode): use left top corner as item reference
+ If the arrangement is LeftToRight (icon view mode): use (center, top) as item reference
+ If the arrangement is TopToBottom (multicolumn view mode): use (left, top) as item reference
+ This is to allow for smooth scrolling when using the keyboard arrow keys.
*/
QIconViewItem* QIconView::findItem(Direction dir, const QIconViewItem *fromItem) const
{
QIconViewItem *closestItem=NULL;
int distPri=0, distSec=0;
int itemDistancePri=0, itemDistanceSec=0;
-
- QPoint pos;
+
+ QPoint pos=fromItem->rect().topLeft();
if (d->arrangement == LeftToRight) {
- pos=fromItem->rect().center();
- }
- else {
- pos=fromItem->rect().topLeft();
+ pos.setX(fromItem->rect().center().x());
}
-
+
QRect searchRect;
switch (dir) {
case DirDown:
@@ -5359,16 +5357,16 @@ QIconViewItem* QIconView::findItem(Direction dir, const QIconViewItem *fromItem)
// DirDown/DirUp : primary distance X, secondary distance Y
// DirLeft/DirRight: primary distance Y, secondary distance X
if (d->arrangement == LeftToRight) {
- // Left to right arrangement (icon view mode): use center as item reference
+ // Left to right arrangement (icon view mode): use (center, top) as item reference
switch (dir) {
case DirDown:
if (ir.center().x() > pos.x()) {
distPri = ir.center().x()-pos.x();
- distSec = ir.center().y();
+ distSec = ir.top();
}
- else if (ir.center().x() == pos.x() && ir.center().y() > pos.y()) {
+ else if (ir.center().x() == pos.x() && ir.top() > pos.y()) {
distPri = 0;
- distSec = ir.center().y()-pos.y();
+ distSec = ir.top()-pos.y();
}
else {
itemOK = false;
@@ -5378,11 +5376,11 @@ QIconViewItem* QIconView::findItem(Direction dir, const QIconViewItem *fromItem)
case DirUp:
if (ir.center().x() < pos.x()) {
distPri = pos.x()-ir.center().x();
- distSec = contentsHeight()-ir.center().y();
+ distSec = contentsHeight()-ir.top();
}
- else if (ir.center().x() == pos.x() && ir.center().y() < pos.y()) {
+ else if (ir.center().x() == pos.x() && ir.top() < pos.y()) {
distPri = 0;
- distSec = pos.y()-ir.center().y();
+ distSec = pos.y()-ir.top();
}
else {
itemOK = false;
@@ -5390,11 +5388,11 @@ QIconViewItem* QIconView::findItem(Direction dir, const QIconViewItem *fromItem)
break;
case DirRight:
- if (ir.center().y() > pos.y()) {
- distPri = ir.center().y()-pos.y();
+ if (ir.top() > pos.y()) {
+ distPri = ir.top()-pos.y();
distSec = ir.center().x();
}
- else if (ir.center().y() == pos.y() && ir.center().x() > pos.x()) {
+ else if (ir.top() == pos.y() && ir.center().x() > pos.x()) {
distPri = 0;
distSec = ir.center().x()-pos.x();
}
@@ -5404,11 +5402,11 @@ QIconViewItem* QIconView::findItem(Direction dir, const QIconViewItem *fromItem)
break;
case DirLeft:
- if (ir.center().y() < pos.y()) {
- distPri = pos.y()-ir.center().y();
+ if (ir.top() < pos.y()) {
+ distPri = pos.y()-ir.top();
distSec = contentsWidth()-ir.center().x();
}
- else if (ir.center().y() == pos.y() && ir.center().x() < pos.x()) {
+ else if (ir.top() == pos.y() && ir.center().x() < pos.x()) {
distPri = 0;
distSec = pos.x()-ir.center().x();
}
@@ -5422,8 +5420,8 @@ QIconViewItem* QIconView::findItem(Direction dir, const QIconViewItem *fromItem)
break;
}
}
- else {
- // Top to bottom arrangement (multicolumn view mode): use left top corner as item reference
+ else {
+ // Top to bottom arrangement (multicolumn view mode): use (left, top) as item reference
switch (dir) {
case DirDown:
if (ir.left() > pos.x()) {
--
cgit v0.9.0.2-52-g1de3
1
0
Hello community,
here is the log from the commit of package tigervnc for openSUSE:Factory checked in at 2015-09-24 06:12:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tigervnc (Old)
and /work/SRC/openSUSE:Factory/.tigervnc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tigervnc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/tigervnc/tigervnc.changes 2015-09-03 18:04:55.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.tigervnc.new/tigervnc.changes 2015-09-24 06:12:41.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Sep 13 14:57:35 UTC 2015 - msrb(a)suse.com
+
+- U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch
+ * Fixes Xvnc with -inetd parameter. (bnc#945600)
+
+-------------------------------------------------------------------
New:
----
U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tigervnc.spec ++++++
--- /var/tmp/diff_new_pack.9LFtnX/_old 2015-09-24 06:12:42.000000000 +0200
+++ /var/tmp/diff_new_pack.9LFtnX/_new 2015-09-24 06:12:42.000000000 +0200
@@ -118,6 +118,7 @@
Patch9: u_tigervnc-display-SHA-1-fingerprint-of-untrusted-certificate.patch
Patch10: u_tigervnc-add-autoaccept-parameter.patch
Patch11: N_tigervnc_revert_fltk_1_3_3_requirements.patch
+Patch12: U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch
%description
TigerVNC is a high-performance, platform-neutral implementation of VNC (Virtual Network Computing),
@@ -159,6 +160,7 @@
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
pushd unix/xserver
patch -p1 < ../xserver117.patch
++++++ U_tigervnc-fix-reversed-logic-in-vncIsTCPPortUsed.patch ++++++
Subject: [PATCH] Fix reversed logic in vncIsTCPPortUsed()
Author: Pierre Ossman <ossman(a)cendio.se>
Patch-mainline: Upstream
Git-commit: 6bb08082956334711de44dad49b95f90a7b02700
Signed-off-by: Michal Srb <msrb(a)suse.com>
Patch by Jay Kulpinski. Prevents -inetd mode from automatically
finding a free X11 display number.
diff --git a/unix/xserver/hw/vnc/RFBGlue.cc b/unix/xserver/hw/vnc/RFBGlue.cc
index 09832ab..a150792 100644
--- a/unix/xserver/hw/vnc/RFBGlue.cc
+++ b/unix/xserver/hw/vnc/RFBGlue.cc
@@ -194,7 +194,7 @@ int vncIsTCPPortUsed(int port)
std::list<network::TcpListener> dummy;
network::createTcpListeners (&dummy, 0, port);
} catch (rdr::Exception& e) {
- return 0;
+ return 1;
}
- return 1;
+ return 0;
}
1
0
Hello community,
here is the log from the commit of package poppler for openSUSE:Factory checked in at 2015-09-24 06:12:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/poppler (Old)
and /work/SRC/openSUSE:Factory/.poppler.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "poppler"
Changes:
--------
--- /work/SRC/openSUSE:Factory/poppler/poppler-qt.changes 2015-08-17 17:25:46.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.poppler.new/poppler-qt.changes 2015-09-24 06:12:33.000000000 +0200
@@ -1,0 +2,31 @@
+Fri Sep 11 18:21:31 UTC 2015 - zaitor(a)opensuse.org
+
+- Update to version 0.36.0:
+ + core:
+ - Patch to support RichMedia annotations.
+ - Splash: Fix wrong memory access (fdo#91686).
+ - Cairo: fix size of transparency group surface (fdo#66229).
+ - Fix bounds check in Linearization::getPageFirst (fdo#91200).
+ - File Saving improvements.
+ - Add premultiplied alpha channel to SplashBitmap.
+ - Fix for xref table creation (fdo#90790).
+ - Fix JBIG2Decode infinite loop and stack overflow (fdo#91186).
+ - Minor optimization in text extraction.
+ + qt4:
+ - Basic support for RichMedia annotations.
+ - Change default image format.
+ - Minor optimizations.
+ + qt5:
+ - Basic support for RichMedia annotations.
+ - Change default image format.
+ - Minor optimizationsHEADmaster.
+ + cpp: Fix utf8/utf16 conversion (fdo#91644).
+ + build system:
+ - Do not hardcode -fPIC in Makefile.am.
+ - cmake: Allow configuring SHARE_INSTALL_DIR (fdo#90293).
+ + utils:
+ - pdfunite: Insert embedded files in result pdf (fdo#90066).
+ - pdftotext: Add -bbox-layout option (fdo#89941).
+- Bump soname following upstream changes.
+
+-------------------------------------------------------------------
poppler-qt5.changes: same change
poppler.changes: same change
Old:
----
poppler-0.35.0.tar.xz
New:
----
poppler-0.36.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ poppler-qt.spec ++++++
--- /var/tmp/diff_new_pack.Vq4H0U/_old 2015-09-24 06:12:34.000000000 +0200
+++ /var/tmp/diff_new_pack.Vq4H0U/_new 2015-09-24 06:12:34.000000000 +0200
@@ -21,11 +21,11 @@
Name: poppler-qt
%define _name poppler
-Version: 0.35.0
+Version: 0.36.0
Release: 0
# Actual version of poppler-data:
%define poppler_data_version 0.4.6
-%define poppler_soname 54
+%define poppler_soname 55
%define poppler_cpp_soname 0
%define poppler_glib_soname 8
%define poppler_qt4_soname 4
poppler-qt5.spec: same change
++++++ poppler.spec ++++++
--- /var/tmp/diff_new_pack.Vq4H0U/_old 2015-09-24 06:12:34.000000000 +0200
+++ /var/tmp/diff_new_pack.Vq4H0U/_new 2015-09-24 06:12:34.000000000 +0200
@@ -21,11 +21,11 @@
Name: poppler
%define _name poppler
-Version: 0.35.0
+Version: 0.36.0
Release: 0
# Actual version of poppler-data:
%define poppler_data_version 0.4.6
-%define poppler_soname 54
+%define poppler_soname 55
%define poppler_cpp_soname 0
%define poppler_glib_soname 8
%define poppler_qt4_soname 4
++++++ poppler-0.35.0.tar.xz -> poppler-0.36.0.tar.xz ++++++
++++ 6051 lines of diff (skipped)
1
0