Magellan Linux

Diff of /smage/trunk/extras/gtk2+/gtk2+-2.24.4-r1.smage2

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1690 by niro, Fri Apr 8 06:51:43 2011 UTC revision 1704 by niro, Fri Apr 8 11:00:18 2011 UTC
# Line 19  DEPEND="\$(eval echo \\\$DEPEND_\${ARCH/ Line 19  DEPEND="\$(eval echo \\\$DEPEND_\${ARCH/
19   >= x11-libs/libXi-1   >= x11-libs/libXi-1
20   >= x11-libs/libXt-1   >= x11-libs/libXt-1
21   >= x11-libs/libXext-1   >= x11-libs/libXext-1
  >= x11-libs/libXcursor-1.1.10  
22   >= x11-libs/libXrandr-1.3   >= x11-libs/libXrandr-1.3
23   >= x11-libs/libXfixes-4   >= x11-libs/libXfixes-4
24   >= x11-libs/libXinerama-1.1   >= x11-libs/libXinerama-1.1
  >= x11-libs/libXcomposite-0.4  
25   >= dev-libs/glib2-2.26   >= dev-libs/glib2-2.26
26   >= dev-libs/atk-1.33   >= dev-libs/atk-1.33
27   >= x11-libs/pango-1.28   >= x11-libs/pango-1.28
28     >= x11-libs/gdk-pixbuf-2.22
29   >= media-libs/libpng-1.5   >= media-libs/libpng-1.5
30   >= media-libs/libjpeg-8   >= media-libs/libjpeg-8
31   >= media-libs/libtiff-3.9   >= media-libs/libtiff-3.9
32   >= x11-libs/cairo-1.10"   >= x11-libs/cairo-1.10"
33    # >= x11-libs/libXcursor-1.1.10
34    # >= x11-libs/libXcomposite-0.4
35    
36  SDEPEND=">= dev-util/pkgconfig-0.25  SDEPEND=">= dev-util/pkgconfig-0.25
37   >= sys-dev/autoconf-4   >= sys-dev/autoconf-4
# Line 42  SRCDIR="${BUILDDIR}/${PNAME/2+/+}-${PVER Line 43  SRCDIR="${BUILDDIR}/${PNAME/2+/+}-${PVER
43  # simul linux32 to get config things right  # simul linux32 to get config things right
44  EMUL_LINUX_32=true  EMUL_LINUX_32=true
45    
46  sminclude multilib mtools  MCORE_ONLY_KEEP="etc
47     usr/bin/gtk-update-icon-cache
48     usr/bin/gtk-query-immodules-2.0
49     usr/$(mlibdir)/*.so
50     usr/$(mlibdir)/*.so.*
51     usr/$(mlibdir)/gtk-2.0/2.10.0/engines/*.so
52     usr/$(mlibdir)/gtk-2.0/2.10.0/immodules/*.so
53     usr/$(mlibdir)/gtk-2.0/2.10.0/printbackends/*.so
54     usr/$(mlibdir)/gtk-2.0/modules/*.so
55     usr/share/themes"
56    sminclude multilib mtools mcore-split
57    
58  SRC_URI=(  SRC_URI=(
59   gnome://${PNAME/2+/+}/${PVER%.*}/${SRCFILE}   gnome://${PNAME/2+/+}/${PVER%.*}/${SRCFILE}
60   ftp://ftp.gtk.org/pub/gtk/v${PVER:0:4}/${SRCFILE}   ftp://ftp.gtk.org/pub/gtk/v${PVER:0:4}/${SRCFILE}
61   mirror://${PNAME}/${SRCFILE}   mirror://${PNAME}/${SRCFILE}
62   mirror://${PNAME}/${PNAME}-2.14.6-multilib.patch   mirror://${PNAME}/${PNAME}-${PVER}-multilib.patch
63     mirror://${PNAME}/${PNAME}-${PVER}-limit-gtksignal-includes.patch
64     mirror://${PNAME}/${PNAME}-${PVER}-old-icons.patch
65  )  )
66    
67  UP2DATE="updatecmd_gnome ${PNAME/2/}"  UP2DATE="updatecmd_gnome ${PNAME/2/}"
# Line 63  src_prepare() Line 76  src_prepare()
76    
77   # fix multilib issues with pixbuf loaders   # fix multilib issues with pixbuf loaders
78   # patch adds the host-triplet to the config search path   # patch adds the host-triplet to the config search path
79   mpatch ${PNAME}-2.14.6-multilib.patch || die   mpatch ${PNAME}-${PVER}-multilib.patch || die
80    
81     # add missing signal header for compat reasons
82     mpatch ${PNAME}-${PVER}-limit-gtksignal-includes.patch || die
83    
84     # use old icon pathes too for compat reasons
85     #mpatch ${PNAME}-${PVER}-old-icons.patch || die
86  }  }
87    
88  src_compile()  src_compile()
# Line 74  src_compile() Line 93  src_compile()
93   [[ ${ARCH} = x86_64 ]] && myconf=--program-suffix=-$(mabi)   [[ ${ARCH} = x86_64 ]] && myconf=--program-suffix=-$(mabi)
94    
95   mconfigure \   mconfigure \
  --with-libjpeg \  
  --with-libtiff \  
  --with-libpng \  
96   --with-gdktarget=x11 \   --with-gdktarget=x11 \
97   --with-xinput \   --with-xinput \
98   --disable-gtk-doc \   --disable-gtk-doc \
  --without-libjasper \  
99   '$(eval echo \$myconf_${abi})' \   '$(eval echo \$myconf_${abi})' \
100   ${myconf} \   ${myconf} \
101   || die   || die
# Line 104  src_install() Line 119  src_install()
119    
120   if [[ ${ARCH} = x86_64 ]]   if [[ ${ARCH} = x86_64 ]]
121   then   then
  mlink multiarch-wrapper /usr/bin/gdk-pixbuf-query-loaders || die  
122   mlink multiarch-wrapper /usr/bin/gtk-query-immodules-2.0 || die   mlink multiarch-wrapper /usr/bin/gtk-query-immodules-2.0 || die
123   fi   fi
124  }  }
# Line 120  postinstall() Line 134  postinstall()
134   confdir=/etc/gtk-2.0/i686-pc-linux-gnu   confdir=/etc/gtk-2.0/i686-pc-linux-gnu
135   install -d ${confdir}   install -d ${confdir}
136   gtk-query-immodules-2.0-m32 > ${confdir}/gtk.immodules   gtk-query-immodules-2.0-m32 > ${confdir}/gtk.immodules
137   gdk-pixbuf-query-loaders-m32 > ${confdir}/gdk-pixbuf.loaders   # remove old pixbuf loaders, now in an extra package
138     if [[ -f ${confdir}/gdk-pixbuf.loaders ]]
139     then
140     rm ${confdir}/gdk-pixbuf.loaders
141     fi
142   fi   fi
143   confdir=/etc/gtk-2.0/${CHOST}   confdir=/etc/gtk-2.0/${CHOST}
144   install -d ${confdir}   install -d ${confdir}
145   gtk-query-immodules-2.0 > ${confdir}/gtk.immodules   gtk-query-immodules-2.0 > ${confdir}/gtk.immodules
146   gdk-pixbuf-query-loaders > ${confdir}/gdk-pixbuf.loaders   # remove old pixbuf loaders, now in an extra package
147     if [[ -f ${confdir}/gdk-pixbuf.loaders ]]
148     then
149     rm ${confdir}/gdk-pixbuf.loaders
150     fi
151   fi   fi
152  }  }

Legend:
Removed from v.1690  
changed lines
  Added in v.1704