flow: Merged '0.25' to ('default').
--- a/CMakeLists.txt Thu Jan 28 22:53:41 2016 -0600
+++ b/CMakeLists.txt Sat Feb 06 20:30:48 2016 -0600
@@ -25,8 +25,8 @@
set(GPLUGIN_MAJOR_VERSION 0)
-set(GPLUGIN_MINOR_VERSION 24)-set(GPLUGIN_MICRO_VERSION 1)+set(GPLUGIN_MINOR_VERSION 25) +set(GPLUGIN_MICRO_VERSION 0) set(GPLUGIN_EXTRA_VERSION)
set(GPLUGIN_VERSION ${GPLUGIN_MAJOR_VERSION}.${GPLUGIN_MINOR_VERSION}.${GPLUGIN_MICRO_VERSION}${GPLUGIN_EXTRA_VERSION})
@@ -106,27 +106,13 @@
-set(REQ_GLIB_VER 2.20.0)-pkg_check_modules(GLIB REQUIRED- glib-2.0>=${REQ_GLIB_VER}- gobject-2.0>=${REQ_GLIB_VER}+pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32.0 gobject-2.0) # we separate gmodule out so our test aren't linked to it
-pkg_check_modules(GMODULE REQUIRED- gmodule-2.0>=${REQ_GLIB_VER}+pkg_check_modules(GMODULE REQUIRED gmodule-2.0) pkg_config_variable(glib-2.0 glib_genmarshal GLIB_GENMARSHAL)
-if(${GLIB_gobject-2.0_VERSION} LESS 2.32.0)- set(GLIB_MKENUMS ${CMAKE_SOURCE_DIR}/tools/glib-mkenums- CACHE FILEPATH "glib-mkenums executable"-else(${GLIB_gobject-2.0_VERSION} LESS 2.32.0)- pkg_config_variable(glib-2.0 glib_mkenums GLIB_MKENUMS)-endif(${GLIB_gobject-2.0_VERSION} LESS 2.32.0)+pkg_config_variable(glib-2.0 glib_mkenums GLIB_MKENUMS) --- a/ChangeLog Thu Jan 28 22:53:41 2016 -0600
+++ b/ChangeLog Sat Feb 06 20:30:48 2016 -0600
@@ -1,3 +1,7 @@
+ * Fix a regression where the GIR file did not have a predictable name. + * Fix the glib requirement. It was set at 2.20, but we require 2.32. * Fixed the version numbering finally
* Updated the version in CMakeLists.txt
--- a/gplugin/CMakeLists.txt Thu Jan 28 22:53:41 2016 -0600
+++ b/gplugin/CMakeLists.txt Sat Feb 06 20:30:48 2016 -0600
@@ -231,7 +231,7 @@
set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CMAKE_BINARY_DIR}")
- FILENAME GPlugin-${GPLUGIN_MAJOR_VERSION}.${GPLUGIN_MINOR_VERSION}.gir+ FILENAME GPlugin-${GPLUGIN_MAJOR_VERSION}.0.gir PACKAGES glib-2.0 gmodule-2.0 gobject-2.0
--- a/packaging/debian/changelog Thu Jan 28 22:53:41 2016 -0600
+++ b/packaging/debian/changelog Sat Feb 06 20:30:48 2016 -0600
@@ -1,8 +1,14 @@
+gplugin (0.25) unstable; urgency=medium + * New upstream release, see official changelog + -- Gary Kramlich <grim@reaperworld.com> Sat, 06 Feb 2016 20:28:53 -0600 gplugin (0.24.1) unstable; urgency=medium
* New upstream release, see official changelog
- -- Gary Kramlich <grim@reaperworld.com> Thu, 28 Jan 2016 22:49:30 -0600+ -- Gary Kramlich <grim@reaperworld.com> Sat, 06 Feb 2016 20:28:47 -0600 gplugin (0.0.24) unstable; urgency=medium
--- a/tools/glib-mkenums Thu Jan 28 22:53:41 2016 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,565 +0,0 @@
-# Information about the current enumeration-my $flags; # Is enumeration a bitmask?-my $option_underscore_name; # Overriden underscore variant of the enum name- # for example to fix the cases we don't get the- # mixed-case -> underscorized transform right.-my $option_lowercase_name; # DEPRECATED. A lower case name to use as part- # of the *_get_type() function, instead of the- # one that we guess. For instance, when an enum- # uses abnormal capitalization and we can not- # guess where to put the underscores.-my $seenbitshift; # Have we seen bitshift operators?-my $enum_prefix; # Prefix for this enumeration-my $enumname; # Name for this enumeration-my $enumshort; # $enumname without prefix-my $enumname_prefix; # prefix of $enumname-my $enumindex = 0; # Global enum counter-my $firstenum = 1; # Is this the first enumeration per file?-my @entries; # [ $name, $val ] for each entry-my $sandbox = Safe->new; # sandbox for safe evaluation of expressions- for $opt (split /\s*,\s*/, $opts) {- my ($key,$val) = $opt =~ /(\w+)(?:=(.+))?/;- defined $val or $val = 1;- push @opts, $key, $val;- my $looking_for_name = 0;- # read lines until we have no open comments- while (m@/\*([^*]|\*(?!/))*$@) {- defined ($new = <$file>) || die "Unmatched comment in $ARGV";- # strip comments w/o options- if ($looking_for_name) {- if (/^\#include\s*<([^>]*)>/ ) {- open NEWFILE, $file or die "Cannot open include file $file: $!\n";- if (parse_entries (\*NEWFILE, $NEWFILE)) {- if (/^\s*\}\s*(\w+)/) {- \s*\w+\s*\(.*\)\s* # macro with multiple args- (?:[^,/]|/(?!\*))* # anything but a comma or comment- my ($name, $value, $options) = ($1,$2,$3);- if (!defined $flags && defined $value && $value =~ /<</) {- if (defined $options) {- my %options = parse_trigraph($options);- if (!defined $options{skip}) {- push @entries, [ $name, $value, $options{nick} ];- push @entries, [ $name, $value ];- # ignore preprocessor directives- print STDERR "$0: $file_name:$.: Failed to parse `$_'\n";- print "glib-mkenums version glib-2.36.3\n";- print "glib-mkenums comes with ABSOLUTELY NO WARRANTY.\n";- print "You may redistribute copies of glib-mkenums under the terms of\n";- print "the GNU General Public License which can be found in the\n";- print "GLib source package. Sources, examples and contact\n";- print "information are available at http://www.gtk.org\n";- print " glib-mkenums [OPTION...] [FILES...]\n\n";- print "Help Options:\n";- print " -h, --help Show this help message\n\n";- print "Utility Options:\n";- print " --identifier-prefix <text> Identifier prefix\n";- print " --symbol-prefix <text> Symbol prefix\n";- print " --fhead <text> Output file header\n";- print " --fprod <text> Per input file production\n";- print " --ftail <text> Output file trailer\n";- print " --eprod <text> Per enum text (produced prior to value itarations)\n";- print " --vhead <text> Value header, produced before iterating over enum values\n";- print " --vprod <text> Value text, produced for each enum value\n";- print " --vtail <text> Value tail, produced after iterating over enum values\n";- print " --comments <text> Comment structure\n";- print " --template file Template file\n";- print " -v, --version Print version informations\n\n";- print "Production text substitutions:\n";- print " \@EnumName\@ PrefixTheXEnum\n";- print " \@enum_name\@ prefix_the_xenum\n";- print " \@ENUMNAME\@ PREFIX_THE_XENUM\n";- print " \@ENUMSHORT\@ THE_XENUM\n";- print " \@ENUMPREFIX\@ PREFIX\n";- print " \@VALUENAME\@ PREFIX_THE_XVALUE\n";- print " \@valuenick\@ the-xvalue\n";- print " \@valuenum\@ the integer value (limited support, Since: 2.26)\n";- print " \@type\@ either enum or flags\n";- print " \@Type\@ either Enum or Flags\n";- print " \@TYPE\@ either ENUM or FLAGS\n";- print " \@filename\@ name of current input file\n";- print " \@basename\@ base name of the current input file (Since: 2.22)\n";-my $idprefix = ""; # "G", "Gtk", etc-my $symprefix = ""; # "g", "gtk", etc, if not just lc($idprefix)-my $fhead = ""; # output file header-my $fprod = ""; # per input file production-my $ftail = ""; # output file trailer-my $eprod = ""; # per enum text (produced prior to value itarations)-my $vhead = ""; # value header, produced before iterating over enum values-my $vprod = ""; # value text, produced for each enum value-my $vtail = ""; # value tail, produced after iterating over enum values-my $comment_tmpl = ""; # comment template-sub read_template_file {- my %tmpl = ('file-header', $fhead, - 'file-production', $fprod, - 'enumeration-production', $eprod,- 'value-header', $vhead,- 'value-production', $vprod,- 'comment', $comment_tmpl);- open (FILE, $file) || die "Can't open $file: $!\n";- if (/^\/\*\*\*\s+(BEGIN|END)\s+([\w-]+)\s+\*\*\*\//) {- if (($in eq 'junk') && ($1 eq 'BEGIN') && (exists($tmpl{$2}))) {- elsif (($in eq $2) && ($1 eq 'END') && (exists($tmpl{$2}))) {- die "Malformed template file $file\n";- if (!($in eq 'junk')) {- if (!($in eq 'junk')) {- die "Malformed template file $file\n";- $fhead = $tmpl{'file-header'};- $fprod = $tmpl{'file-production'};- $ftail = $tmpl{'file-tail'};- $eprod = $tmpl{'enumeration-production'};- $vhead = $tmpl{'value-header'};- $vprod = $tmpl{'value-production'};- $vtail = $tmpl{'value-tail'};- $comment_tmpl = $tmpl{'comment'};- # default to C-style comments- $comment_tmpl = "/* \@comment\@ */" if $comment_tmpl eq "";-if (!defined $ARGV[0]) {-while ($_=$ARGV[0],/^-/) {- if (/^--template$/) { read_template_file (shift); }- elsif (/^--identifier-prefix$/) { $idprefix = shift }- elsif (/^--symbol-prefix$/) { $symprefix = shift }- elsif (/^--fhead$/) { $fhead = $fhead . shift }- elsif (/^--fprod$/) { $fprod = $fprod . shift }- elsif (/^--ftail$/) { $ftail = $ftail . shift }- elsif (/^--eprod$/) { $eprod = $eprod . shift }- elsif (/^--vhead$/) { $vhead = $vhead . shift }- elsif (/^--vprod$/) { $vprod = $vprod . shift }- elsif (/^--vtail$/) { $vtail = $vtail . shift }- elsif (/^--comments$/) { $comment_tmpl = shift }- elsif (/^--help$/ || /^-h$/ || /^-\?$/) { usage; }- elsif (/^--version$/ || /^-v$/) { version; }- last if not defined($ARGV[0]);-# put auto-generation comment- my $comment = $comment_tmpl;- $comment =~ s/\@comment\@/Generated data (by glib-mkenums)/;- print "\n" . $comment . "\n\n";- my $base = basename ($ARGV[0]);- $prod =~ s/\@filename\@/$ARGV[0]/g;- $prod =~ s/\@basename\@/$base/g;- $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;- $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;- close (ARGV); # reset line numbering- $firstenum = 1; # Flag to print filename at next enum- # read lines until we have no open comments- while (m@/\*([^*]|\*(?!/))*$@) {- defined ($new = <>) || die "Unmatched comment in $ARGV";- # strip comments w/o options- # ignore forward declarations- next if /^\s*typedef\s+enum.*;/;- if (m@^\s*typedef\s+enum\s*- my %options = parse_trigraph ($2);- next if defined $options{skip};- $enum_prefix = $options{prefix};- $flags = $options{flags};- $option_lowercase_name = $options{lowercase_name};- $option_underscore_name = $options{underscore_name};- $option_lowercase_name = undef;- $option_underscore_name = undef;- if (defined $option_lowercase_name) {- if (defined $option_underscore_name) {- print STDERR "$0: $ARGV:$.: lowercase_name overriden with underscore_name\n";- $option_lowercase_name = undef;- print STDERR "$0: $ARGV:$.: lowercase_name is deprecated, use underscore_name\n";- # Didn't have trailing '{' look on next lines- if (!defined $1 && !defined $4) {- die "Hit end of file while parsing enum in $ARGV";- # Now parse the entries- parse_entries (\*ARGV, $ARGV);- # figure out if this was a flags or enums enumeration- $flags = $seenbitshift;- # Autogenerate a prefix- if (!defined $enum_prefix) {- if (defined $enum_prefix) {- my $tmp = ~ ($name ^ $enum_prefix);- ($tmp) = $tmp =~ /(^\xff*)/;- $enum_prefix = $enum_prefix & $tmp;- if (!defined $enum_prefix) {- # Trim so that it ends in an underscore- $enum_prefix =~ s/_[^_]*$/_/;- # canonicalize user defined prefixes- $enum_prefix = uc($enum_prefix);- $enum_prefix =~ s/-/_/g;- $enum_prefix =~ s/(.*)([^_])$/$1$2_/;- for $entry (@entries) {- my ($name,$num,$nick) = @{$entry};- ($nick = $name) =~ s/^$enum_prefix//;- @{$entry} = ($name, $num, $nick);- if (defined $option_underscore_name) {- $enumlong = uc $option_underscore_name;- $enumsym = lc $option_underscore_name;- $enumshort = $enumlong;- $enumshort =~ s/^[A-Z][A-Z0-9]*_//;- $enumname_prefix = $enumlong;- $enumname_prefix =~ s/_$enumshort$//;- } elsif (!$symprefix && !$idprefix) {- # enumname is e.g. GMatchType- $enspace =~ s/^([A-Z][a-z]*).*$/$1/;- $enumshort = $enumname;- $enumshort =~ s/^[A-Z][a-z]*//;- $enumshort =~ s/([^A-Z])([A-Z])/$1_$2/g;- $enumshort =~ s/([A-Z][A-Z])([A-Z][0-9a-z])/$1_$2/g;- $enumshort = uc($enumshort);- $enumname_prefix = $enumname;- $enumname_prefix =~ s/^([A-Z][a-z]*).*$/$1/;- $enumname_prefix = uc($enumname_prefix);- $enumlong = uc($enspace) . "_" . $enumshort;- $enumsym = lc($enspace) . "_" . lc($enumshort);- if (defined($option_lowercase_name)) {- $enumsym = $option_lowercase_name;- $enumshort = $enumname;- $enumshort =~ s/^${idprefix}//;- $enumshort =~ s/^[A-Z][a-z]*//;- $enumshort =~ s/([^A-Z])([A-Z])/$1_$2/g;- $enumshort =~ s/([A-Z][A-Z])([A-Z][0-9a-z])/$1_$2/g;- $enumshort = uc($enumshort);- $enumname_prefix = $symprefix && uc($symprefix) || uc($idprefix);- $enumlong = $enumname_prefix . "_" . $enumshort;- $enumsym = lc($enumlong);- my $base = basename ($ARGV);- $prod =~ s/\@filename\@/$ARGV/g;- $prod =~ s/\@basename\@/$base/g;- $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;- $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;- $prod =~ s/\@enum_name\@/$enumsym/g;- $prod =~ s/\@EnumName\@/$enumname/g;- $prod =~ s/\@ENUMSHORT\@/$enumshort/g;- $prod =~ s/\@ENUMNAME\@/$enumlong/g;- $prod =~ s/\@ENUMPREFIX\@/$enumname_prefix/g;- if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }- if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }- if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }- $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;- $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;- $prod =~ s/\@enum_name\@/$enumsym/g;- $prod =~ s/\@EnumName\@/$enumname/g;- $prod =~ s/\@ENUMSHORT\@/$enumshort/g;- $prod =~ s/\@ENUMNAME\@/$enumlong/g;- $prod =~ s/\@ENUMPREFIX\@/$enumname_prefix/g;- if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }- if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }- if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }- $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;- $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;- $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;- $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;- my ($name,$num,$nick) = @{$_};- if ($prod =~ /\@valuenum\@/) {- # only attempt to eval the value if it is requested- # this prevents us from throwing errors otherwise- # use sandboxed perl evaluation as a reasonable- # approximation to C constant folding- $num = $sandbox->reval ($num);- # make sure it parsed to an integer- if (!defined $num or $num !~ /^-?\d+$/) {- die "Unable to parse enum value '$num'";- $tmp_prod =~ s/\@valuenum\@/$num/g;- $tmp_prod =~ s/\@VALUENAME\@/$name/g;- $tmp_prod =~ s/\@valuenick\@/$nick/g;- if ($flags) { $tmp_prod =~ s/\@type\@/flags/g; } else { $tmp_prod =~ s/\@type\@/enum/g; }- if ($flags) { $tmp_prod =~ s/\@Type\@/Flags/g; } else { $tmp_prod =~ s/\@Type\@/Enum/g; }- if ($flags) { $tmp_prod =~ s/\@TYPE\@/FLAGS/g; } else { $tmp_prod =~ s/\@TYPE\@/ENUM/g; }- $prod =~ s/\@enum_name\@/$enumsym/g;- $prod =~ s/\@EnumName\@/$enumname/g;- $prod =~ s/\@ENUMSHORT\@/$enumshort/g;- $prod =~ s/\@ENUMNAME\@/$enumlong/g;- $prod =~ s/\@ENUMPREFIX\@/$enumname_prefix/g;- if ($flags) { $prod =~ s/\@type\@/flags/g; } else { $prod =~ s/\@type\@/enum/g; }- if ($flags) { $prod =~ s/\@Type\@/Flags/g; } else { $prod =~ s/\@Type\@/Enum/g; }- if ($flags) { $prod =~ s/\@TYPE\@/FLAGS/g; } else { $prod =~ s/\@TYPE\@/ENUM/g; }- $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;- $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;- my $base = basename ($ARGV);- $prod =~ s/\@filename\@/$ARGV/g;- $prod =~ s/\@basename\@/$base/g;- $prod =~ s/\\a/\a/g; $prod =~ s/\\b/\b/g; $prod =~ s/\\t/\t/g; $prod =~ s/\\n/\n/g;- $prod =~ s/\\f/\f/g; $prod =~ s/\\r/\r/g;-# put auto-generation comment- my $comment = $comment_tmpl;- $comment =~ s/\@comment\@/Generated data ends here/;- print "\n" . $comment . "\n\n";
