Ticket #26710: update_pixbuf_to_2.22.0.patch

File update_pixbuf_to_2.22.0.patch, 8.8 KB (added by anatol (Anatol Pomozov), 14 years ago)

Bum ddk-pixbuf to 2.22

  • files/patch-ltmain.sh.diff

     
    1 --- ltmain.sh   Wed Jun 19 03:11:09 2002
    2 +++ ltmain.sh   Sat Jun 22 05:58:22 2002
    3 @@ -2924,7 +2924,23 @@
    4         if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
    5           eval cmds=\"$archive_expsym_cmds\"
    6         else
    7 +         if test "x$verstring" = "x0.0"; then
    8 +           tmp_verstring=
    9 +         else
    10 +           tmp_verstring="$verstring"
    11 +         fi
    12 +         save_deplibs="$deplibs"
    13 +         for conv in $convenience; do
    14 +           tmp_deplibs=
    15 +           for test_deplib in $deplibs; do
    16 +             if test "$test_deplib" != "$conv"; then
    17 +               tmp_deplibs="$tmp_deplibs $test_deplib"
    18 +             fi
    19 +           done
    20 +           deplibs="$tmp_deplibs"
    21 +         done
    22           eval cmds=\"$archive_cmds\"
    23 +         deplibs="$save_deplibs"
    24         fi
    25         save_ifs="$IFS"; IFS='~'
    26         for cmd in $cmds; do

  • files/patch-gdk-pixbuf-Makefile.in.diff

     
    1 --- gdk-pixbuf/Makefile.in.orig Wed Dec 18 14:19:32 2002
    2 +++ gdk-pixbuf/Makefile.in      Sun Jun 22 18:01:15 2003
    3 @@ -133,70 +133,70 @@
    4  #
    5  libpixbufloader_png_la_SOURCES = io-png.c
    6  libpixbufloader_png_la_LDFLAGS = -module -avoid-version
    7 -libpixbufloader_png_la_LIBADD = $(LIBPNG) libgdk_pixbuf.la $(GTK_LIBS)
    8 +libpixbufloader_png_la_LIBADD = $(LIBPNG) $(GTK_LIBS)
    9  
    10  #
    11  # The JPEG loader
    12  #
    13  libpixbufloader_jpeg_la_SOURCES = io-jpeg.c
    14  libpixbufloader_jpeg_la_LDFLAGS = -module -avoid-version
    15 -libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) libgdk_pixbuf.la $(GTK_LIBS)
    16 +libpixbufloader_jpeg_la_LIBADD = $(LIBJPEG) $(GTK_LIBS)
    17  
    18  #
    19  # The XPM loader
    20  #
    21  libpixbufloader_xpm_la_SOURCES = io-xpm.c
    22  libpixbufloader_xpm_la_LDFLAGS = -module -avoid-version
    23 -libpixbufloader_xpm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
    24 +libpixbufloader_xpm_la_LIBADD = $(GTK_LIBS)
    25  
    26  #
    27  # The GIF loader
    28  #
    29  libpixbufloader_gif_la_SOURCES = io-gif.c
    30  libpixbufloader_gif_la_LDFLAGS = -module -avoid-version
    31 -libpixbufloader_gif_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
    32 +libpixbufloader_gif_la_LIBADD = $(GTK_LIBS)
    33  
    34  #
    35  # The ICO loader
    36  #
    37  libpixbufloader_ico_la_SOURCES = io-ico.c
    38  libpixbufloader_ico_la_LDFLAGS = -module -avoid-version
    39 -libpixbufloader_ico_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
    40 +libpixbufloader_ico_la_LIBADD = $(GTK_LIBS)
    41  
    42  #
    43  # The RAS loader
    44  #
    45  libpixbufloader_ras_la_SOURCES = io-ras.c
    46  libpixbufloader_ras_la_LDFLAGS = -module -avoid-version
    47 -libpixbufloader_ras_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
    48 +libpixbufloader_ras_la_LIBADD = $(GTK_LIBS)
    49  
    50  #
    51  # The TIFF loader
    52  #
    53  libpixbufloader_tiff_la_SOURCES = io-tiff.c
    54  libpixbufloader_tiff_la_LDFLAGS = -module -avoid-version
    55 -libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) libgdk_pixbuf.la $(GTK_LIBS)
    56 +libpixbufloader_tiff_la_LIBADD = $(LIBTIFF) $(GTK_LIBS)
    57  
    58  #
    59  # The PNM loader
    60  #
    61  libpixbufloader_pnm_la_SOURCES = io-pnm.c
    62  libpixbufloader_pnm_la_LDFLAGS = -module -avoid-version
    63 -libpixbufloader_pnm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
    64 +libpixbufloader_pnm_la_LIBADD = $(GTK_LIBS)
    65  
    66  #
    67  # The BMP loader
    68  #
    69  libpixbufloader_bmp_la_SOURCES = io-bmp.c
    70  libpixbufloader_bmp_la_LDFLAGS = -module -avoid-version
    71 -libpixbufloader_bmp_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
    72 +libpixbufloader_bmp_la_LIBADD = $(GTK_LIBS)
    73  
    74  #
    75  # The XBM loader
    76  #
    77  libpixbufloader_xbm_la_SOURCES = io-xbm.c
    78  libpixbufloader_xbm_la_LDFLAGS = -module -avoid-version
    79 -libpixbufloader_xbm_la_LIBADD = libgdk_pixbuf.la $(GTK_LIBS)
    80 +libpixbufloader_xbm_la_LIBADD = $(GTK_LIBS)
    81  
    82  @HAVE_PNG_TRUE@PNG_LIB = @HAVE_PNG_TRUE@libpixbufloader-png.la
    83  
    84 @@ -310,7 +310,7 @@
    85  
    86  
    87  libgdk_pixbuf_xlib_la_LDFLAGS = -version-info 2:0:0 -export-dynamic $(GLIB_LIBS) $(X11_LIBS)
    88 -libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la libgdk_pixbuf.la $(GTK_LIBS)
    89 +libgdk_pixbuf_xlib_la_LIBADD = pixops/libpixops.la $(GTK_LIBS)
    90  
    91  libgdk_pixbufinclude_HEADERS = \
    92         gdk-pixbuf.h                    \
    93 @@ -356,8 +356,7 @@
    94  @BUILD_DYNAMIC_MODULES_TRUE@gdk-pixbuf-loader.lo gdk-pixbuf-render.lo \
    95  @BUILD_DYNAMIC_MODULES_TRUE@gdk-pixbuf-scale.lo gdk-pixbuf-util.lo \
    96  @BUILD_DYNAMIC_MODULES_TRUE@gdk-pixbuf-parse-color.lo
    97 -libgdk_pixbuf_xlib_la_DEPENDENCIES =  pixops/libpixops.la \
    98 -libgdk_pixbuf.la
    99 +libgdk_pixbuf_xlib_la_DEPENDENCIES =  pixops/libpixops.la
    100  @BUILD_DYNAMIC_MODULES_FALSE@libgdk_pixbuf_xlib_la_OBJECTS =  \
    101  @BUILD_DYNAMIC_MODULES_FALSE@gdk-pixbuf.lo gdk-pixbuf-xlib.lo \
    102  @BUILD_DYNAMIC_MODULES_FALSE@gdk-pixbuf-animation.lo gdk-pixbuf-data.lo \
    103 @@ -380,25 +379,25 @@
    104  libgnomecanvaspixbuf_la_LIBADD =
    105  @BUILD_CANVAS_ITEM_TRUE@libgnomecanvaspixbuf_la_OBJECTS =  \
    106  @BUILD_CANVAS_ITEM_TRUE@gnome-canvas-pixbuf.lo
    107 -libpixbufloader_png_la_DEPENDENCIES =  libgdk_pixbuf.la
    108 +libpixbufloader_png_la_DEPENDENCIES =
    109  libpixbufloader_png_la_OBJECTS =  io-png.lo
    110 -libpixbufloader_jpeg_la_DEPENDENCIES =  libgdk_pixbuf.la
    111 +libpixbufloader_jpeg_la_DEPENDENCIES =
    112  libpixbufloader_jpeg_la_OBJECTS =  io-jpeg.lo
    113 -libpixbufloader_gif_la_DEPENDENCIES =  libgdk_pixbuf.la
    114 +libpixbufloader_gif_la_DEPENDENCIES =
    115  libpixbufloader_gif_la_OBJECTS =  io-gif.lo
    116 -libpixbufloader_ico_la_DEPENDENCIES =  libgdk_pixbuf.la
    117 +libpixbufloader_ico_la_DEPENDENCIES =
    118  libpixbufloader_ico_la_OBJECTS =  io-ico.lo
    119 -libpixbufloader_ras_la_DEPENDENCIES =  libgdk_pixbuf.la
    120 +libpixbufloader_ras_la_DEPENDENCIES =
    121  libpixbufloader_ras_la_OBJECTS =  io-ras.lo
    122 -libpixbufloader_xpm_la_DEPENDENCIES =  libgdk_pixbuf.la
    123 +libpixbufloader_xpm_la_DEPENDENCIES =
    124  libpixbufloader_xpm_la_OBJECTS =  io-xpm.lo
    125 -libpixbufloader_tiff_la_DEPENDENCIES =  libgdk_pixbuf.la
    126 +libpixbufloader_tiff_la_DEPENDENCIES =
    127  libpixbufloader_tiff_la_OBJECTS =  io-tiff.lo
    128 -libpixbufloader_pnm_la_DEPENDENCIES =  libgdk_pixbuf.la
    129 +libpixbufloader_pnm_la_DEPENDENCIES =
    130  libpixbufloader_pnm_la_OBJECTS =  io-pnm.lo
    131 -libpixbufloader_bmp_la_DEPENDENCIES =  libgdk_pixbuf.la
    132 +libpixbufloader_bmp_la_DEPENDENCIES =
    133  libpixbufloader_bmp_la_OBJECTS =  io-bmp.lo
    134 -libpixbufloader_xbm_la_DEPENDENCIES =  libgdk_pixbuf.la
    135 +libpixbufloader_xbm_la_DEPENDENCIES =
    136  libpixbufloader_xbm_la_OBJECTS =  io-xbm.lo
    137  noinst_PROGRAMS =  test-gdk-pixbuf$(EXEEXT) testpixbuf$(EXEEXT) \
    138  testpixbuf-drawable$(EXEEXT) testanimation$(EXEEXT) \

  • files/patch-configure.diff

     
    1 --- configure   Wed Jun 19 03:11:21 2002
    2 +++ configure   Sat Jun 22 05:58:58 2002
    3 @@ -4392,7 +4392,7 @@
    4      # FIXME: Relying on posixy $() will cause problems for
    5      #        cross-compilation, but unfortunately the echo tests do not
    6      #        yet detect zsh echo's removal of \ escapes.
    7 -    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
    8 +    archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $tmp_verstring'
    9      # We need to add '_' to the symbols in $export_symbols first
    10      #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
    11      hardcode_direct=yes

  • files/patch-Makefile.in.diff

     
    1 --- Makefile.in.orig    Mon Nov 25 14:32:17 2002
    2 +++ Makefile.in Mon Nov 25 14:32:40 2002
    3 @@ -111,7 +111,7 @@
    4  STRIP_END = @STRIP_END@
    5  VERSION = @VERSION@
    6  
    7 -SUBDIRS = gdk-pixbuf demo doc
    8 +SUBDIRS = gdk-pixbuf doc
    9  
    10  bin_SCRIPTS = gdk-pixbuf-config
    11  

  • Portfile

     
    44PortSystem 1.0
    55
    66name            gdk-pixbuf
    7 version         0.22.0
     7version         2.22.0
    88set branch      [join [lrange [split ${version} .] 0 1] .]
    99revision        3
    1010categories      graphics
    … …  
    2020master_sites    gnome:sources/${name}/${branch}
    2121
    2222use_bzip2       yes
    23 checksums       md5 05fcb68ceaa338614ab650c775efc2f2
     23checksums       md5 0447e70f7bada542182d12e6459442b0
    2424
    2525depends_build   port:tiff port:jpeg port:libpng \
    26                 port:glib1 port:gtk1
     26                port:glib2 port:gtk2
    2727
    2828universal_variant no
    2929
    30 patchfiles      patch-Makefile.in.diff patch-configure.diff \
    31                 patch-ltmain.sh.diff patch-gdk-pixbuf-Makefile.in.diff
    32 
    3330configure.cflags-append "-L${prefix}/lib"
    3431configure.env           LIBS="-L${prefix}/lib"
    3532configure.args  --with-html-dir=${prefix}/share/doc/$name --disable-gtk-doc