pidgin/pidgin

Fix including config.h file into perl files

2014-02-02, Tomasz Wasilczyk
1db9ef49bc22
Parents 79ccaf2efd0b
Children f83a8282b45a
Fix including config.h file into perl files
5 files changed, 5 insertions(+), 8 deletions(-)
  • +1 -0
    .hgignore
  • +2 -2
    libpurple/plugins/perl/common/Makefile.PL.in
  • +0 -2
    libpurple/plugins/perl/common/Purple.pm
  • +2 -2
    pidgin/plugins/perl/common/Makefile.PL.in
  • +0 -2
    pidgin/plugins/perl/common/Pidgin.pm
    • --- a/.hgignore Sun Feb 02 14:08:43 2014 +0100
    +++ b/.hgignore Sun Feb 02 20:17:46 2014 +0100
    @@ -1,6 +1,7 @@
    syntax: glob
    .*.swp
    clang_output_*
    +pidgin-*
    syntax: regexp
    (.*/)?TAGS$
    --- a/libpurple/plugins/perl/common/Makefile.PL.in Sun Feb 02 14:08:43 2014 +0100
    +++ b/libpurple/plugins/perl/common/Makefile.PL.in Sun Feb 02 20:17:46 2014 +0100
    @@ -4,14 +4,14 @@
    # of the Makefile that is written.
    WriteMakefile(
    'NAME' => 'Purple',
    - 'VERSION_FROM' => '@srcdir@/Purple.pm', # finds $VERSION
    + 'VERSION' => '@VERSION@',
    'PREREQ_PM' => {}, # e.g., Module::Name => 1.1
    ($] >= 5.005 ? ## Add these new keywords supported since 5.005
    (ABSTRACT_FROM => '@srcdir@/Purple.pm', # finds $ABSTRACT
    AUTHOR => 'Purple <https://pidgin.im/>') : ()),
    'DEFINE' => '@DEBUG_CFLAGS@ -Wno-float-equal',
    'dynamic_lib' => { 'OTHERLDFLAGS' => '@LDFLAGS@' },
    - 'INC' => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple @GLIB_CFLAGS@',
    + 'INC' => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple @GLIB_CFLAGS@ -DHAVE_CONFIG_H',
    'OBJECT' => '$(O_FILES)', # link all the C files too
    # 'OPTIMIZE' => '-g', # For debugging
    'INSTALLDIRS' => 'vendor',
    --- a/libpurple/plugins/perl/common/Purple.pm Sun Feb 02 14:08:43 2014 +0100
    +++ b/libpurple/plugins/perl/common/Purple.pm Sun Feb 02 20:17:46 2014 +0100
    @@ -27,8 +27,6 @@
    );
    -our $VERSION = '0.01';
    -
    sub AUTOLOAD {
    # This AUTOLOAD is used to 'autoload' constants from the constant()
    # XS function.
    --- a/pidgin/plugins/perl/common/Makefile.PL.in Sun Feb 02 14:08:43 2014 +0100
    +++ b/pidgin/plugins/perl/common/Makefile.PL.in Sun Feb 02 20:17:46 2014 +0100
    @@ -4,13 +4,13 @@
    # of the Makefile that is written.
    WriteMakefile(
    'NAME' => 'Pidgin',
    - 'VERSION_FROM' => '@srcdir@/Pidgin.pm', # finds $VERSION
    + 'VERSION' => '@VERSION@',
    ($] >= 5.005 ? ## Add these new keywords supported since 5.005
    ('ABSTRACT_FROM' => '@srcdir@/Pidgin.pm', # finds $ABSTRACT
    'AUTHOR' => 'Pidgin <https://pidgin.im/>') : ()),
    'DEFINE' => '@DEBUG_CFLAGS@ -Wno-float-equal',
    'dynamic_lib' => { 'OTHERLDFLAGS' => '@LDFLAGS@' },
    - 'INC' => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple -I@top_srcdir@/pidgin @GTK_CFLAGS@ @WEBKIT_CFLAGS@',
    + 'INC' => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple -I@top_srcdir@/pidgin @GTK_CFLAGS@ @WEBKIT_CFLAGS@ -DHAVE_CONFIG_H',
    'OBJECT' => '$(O_FILES)', # link all the C files too
    'TYPEMAPS' => ["@top_srcdir@/libpurple/plugins/perl/common/typemap"],
    # 'OPTIMIZE' => '-g', # For debugging.
    --- a/pidgin/plugins/perl/common/Pidgin.pm Sun Feb 02 14:08:43 2014 +0100
    +++ b/pidgin/plugins/perl/common/Pidgin.pm Sun Feb 02 20:17:46 2014 +0100
    @@ -5,8 +5,6 @@
    use warnings;
    use Carp;
    -our $VERSION = '0.01';
    -
    use Purple;
    require XSLoader;