Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
1d84afcf
Kaydet (Commit)
1d84afcf
authored
Haz 14, 2011
tarafından
Christian Lohmaier
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
remove noise from configure on Mac, use --disable-dependency-tracking
üst
4ef9af9e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
74 additions
and
23 deletions
+74
-23
gdk-pixbuf-2.23.0.patch
gdk-pixbuf/gdk-pixbuf-2.23.0.patch
+55
-4
makefile.mk
gdk-pixbuf/makefile.mk
+19
-19
No files found.
gdk-pixbuf/gdk-pixbuf-2.23.0.patch
Dosyayı görüntüle @
1d84afcf
--- misc/gdk-pixbuf-2.23.0/configure 2010-12-23 15:18:11.000000000 +0100
--- misc/gdk-pixbuf-2.23.0/configure 2010-12-23 15:18:11.000000000 +0100
+++ misc/build/gdk-pixbuf-2.23.0/configure 2011-0
2-28 18:49:26.000000000 +01
00
+++ misc/build/gdk-pixbuf-2.23.0/configure 2011-0
6-14 15:20:05.000000000 +02
00
@@ -16839,7 +16839,7 @@
@@ -16839,7 +16839,7 @@
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
if test -n "$ac_tool_prefix"; then
@@ -17158,
7 +17158,11
@@
@@ -17158,
14 +17158,18
@@
rm -f conf.glibtest
rm -f conf.glibtest
...
@@ -21,7 +21,58 @@
...
@@ -21,7 +21,58 @@
+fi
+fi
# See if it's safe to turn G_DISABLE_DEPRECATED on.
# See if it's safe to turn G_DISABLE_DEPRECATED on.
GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
-GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
-GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.25.15 | sed "s/\.[^.]*\$//"`
-if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
+#GLIB_VERSION_MAJOR_MINOR=`$PKG_CONFIG --modversion glib-2.0 | sed "s/\.[^.]*\$//"`
+#GLIB_REQUIRED_VERSION_MAJOR_MINOR=`echo 2.25.15 | sed "s/\.[^.]*\$//"`
+#if test "x$GLIB_VERSION_MAJOR_MINOR" = "x$GLIB_REQUIRED_VERSION_MAJOR_MINOR"; then
CFLAGS="-DG_DISABLE_DEPRECATED $CFLAGS"
-fi
+#fi
CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CFLAGS"
@@ -17801,7 +17805,7 @@
for l in libpng libpng14 libpng12 libpng13 libpng10 ; do
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $l" >&5
$as_echo_n "checking for $l... " >&6; }
- if $PKG_CONFIG --exists $l ; then
+ if false ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
PNG='png'
@@ -18206,8 +18210,8 @@
$as_echo_n "checking if gio can sniff png... " >&6; }
gtk_save_LIBS="$LIBS"
gtk_save_CFLAGS="$CFLAGS"
- LIBS="`$PKG_CONFIG --libs gio-2.0`"
- CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
+ #LIBS="`$PKG_CONFIG --libs gio-2.0`"
+ #CFLAGS="`$PKG_CONFIG --cflags gio-2.0`"
if test "$cross_compiling" = yes; then :
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
@@ -18622,8 +18626,8 @@
GDK_PIXBUF_PACKAGES="gmodule-no-export-2.0 gobject-2.0 gio-2.0"
GDK_PIXBUF_EXTRA_LIBS="$STATIC_LIB_DEPS $MATH_LIB $MEDIA_LIB"
GDK_PIXBUF_EXTRA_CFLAGS=
-GDK_PIXBUF_DEP_LIBS="`$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
-GDK_PIXBUF_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $PNG_DEP_CFLAGS_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS"
+GDK_PIXBUF_DEP_LIBS="$GDK_PIXBUF_EXTRA_LIBS"
+GDK_PIXBUF_DEP_CFLAGS="$GDK_PIXBUF_EXTRA_CFLAGS"
@@ -18640,7 +18644,7 @@
GDK_PIXBUF_XLIB_EXTRA_CFLAGS=
GDK_PIXBUF_XLIB_EXTRA_LIBS=
-if $PKG_CONFIG --exists x11; then
+if false; then
if true; then
USE_X11_TRUE=
USE_X11_FALSE='#'
--- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c
--- misc/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c
+++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c
+++ misc/build/gdk-pixbuf-2.23.0/gdk-pixbuf/gdk-pixbuf-util.c
@@ -23,7 +23,9 @@
@@ -23,7 +23,9 @@
...
@@ -34,7 +85,7 @@
...
@@ -34,7 +85,7 @@
#include "gdk-pixbuf-transform.h"
#include "gdk-pixbuf-transform.h"
#include "gdk-pixbuf-private.h"
#include "gdk-pixbuf-private.h"
@@ -336,15 +33
6
,19 @@
@@ -336,15 +33
8
,19 @@
const gchar *
const gchar *
gdk_pixbuf_gettext (const gchar *msgid)
gdk_pixbuf_gettext (const gchar *msgid)
{
{
...
...
gdk-pixbuf/makefile.mk
Dosyayı görüntüle @
1d84afcf
...
@@ -52,13 +52,13 @@ TARFILE_MD5=a7d6c5f2fe2d481149ed3ba807b5c043
...
@@ -52,13 +52,13 @@ TARFILE_MD5=a7d6c5f2fe2d481149ed3ba807b5c043
PATCH_FILES
=
gdk-pixbuf-2.23.0.patch
PATCH_FILES
=
gdk-pixbuf-2.23.0.patch
CONFIGURE_DIR
=
CONFIGURE_DIR
=
CONFIGURE_ACTION
=
$(AUGMENT_LIBRARY_PATH)
\
CONFIGURE_ACTION
=
$(AUGMENT_LIBRARY_PATH)
\
BASE_DEPENDENCIES_CFLAGS
=
"-I
$(SOLARINCDIR)
$/
external -I
$(SOLARINCDIR)$
/
external/glib-2.0"
\
BASE_DEPENDENCIES_CFLAGS
=
"-I
$(SOLARINCDIR)
/external -I
$(SOLARINCDIR)
/external/glib-2.0"
\
BASE_DEPENDENCIES_LIBS
=
" "
\
BASE_DEPENDENCIES_LIBS
=
" "
\
.
$/
configure
\
.
/configure
--disable-dependency-tracking
$
(
eq,
$(VERBOSE)
,
$(NULL)
--enable-silent-rules
--disable-silent-rules
)
\
CPPFLAGS
=
"
$(EXTRA_CDEFS)
-I
$(SOLARINCDIR)
$/
external -I
$(SOLARINCDIR)$/
external
$/
glib-2.0 -I
$(SOLARINCDIR)$/
external
$/
libpng -I
$(SOLARINCDIR)$/
external
$
/
jpeg"
\
CPPFLAGS
=
"
$(EXTRA_CDEFS)
-I
$(SOLARINCDIR)
/external -I
$(SOLARINCDIR)
/external/glib-2.0 -I
$(SOLARINCDIR)
/external/libpng -I
$(SOLARINCDIR)
/external
/jpeg"
\
CFLAGS
=
"
$(ARCH_FLAGS)
$(EXTRA_CFLAGS)
"
\
CFLAGS
=
"
$(ARCH_FLAGS)
$(EXTRA_CFLAGS)
"
\
LDFLAGS
=
"
$(EXTRA_LINKFLAGS)
-L
$(SOLARLIBDIR)
-lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0"
\
LDFLAGS
=
"
$(EXTRA_LINKFLAGS)
-L
$(SOLARLIBDIR)
-lgobject-2.0 -lgio-2.0 -lgthread-2.0 -lgmodule-2.0 -lglib-2.0"
\
--prefix
=
$(SRC_ROOT)
$/$(PRJNAME)$
/$(MISC)
\
--prefix
=
$(SRC_ROOT)
/
$(PRJNAME)
/
$(MISC)
\
--disable-nls
\
--disable-nls
\
--disable-modules
\
--disable-modules
\
--with-included-loaders
=
ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif,bmp,gif,ico,jpeg
\
--with-included-loaders
=
ani,icns,pcx,ras,tga,png,pnm,wbmp,xbm,xpm,qtif,bmp,gif,ico,jpeg
\
...
@@ -95,21 +95,21 @@ CONFIGURE_ACTION=
...
@@ -95,21 +95,21 @@ CONFIGURE_ACTION=
BUILD_DIR
=
./gdk-pixbuf
BUILD_DIR
=
./gdk-pixbuf
BUILD_ACTION
=
nmake
-f
makefile.msc
BUILD_ACTION
=
nmake
-f
makefile.msc
OUT2LIB
+=
gdk-pixbuf
$
/
gdk_pixbuf-2.0.lib
OUT2LIB
+=
gdk-pixbuf/gdk_pixbuf-2.0.lib
OUT2BIN
+=
gdk-pixbuf
$
/
libgdk_pixbuf-2.0-0.dll
OUT2BIN
+=
gdk-pixbuf/libgdk_pixbuf-2.0-0.dll
OUT2INC
+=
gdk-pixbuf
$
/
gdk-pixbuf-animation.h
OUT2INC
+=
gdk-pixbuf/gdk-pixbuf-animation.h
OUT2INC
+=
gdk-pixbuf
$
/
gdk-pixbuf-features.h
OUT2INC
+=
gdk-pixbuf/gdk-pixbuf-features.h
OUT2INC
+=
gdk-pixbuf
$
/
gdk-pixbuf-marshal.h
OUT2INC
+=
gdk-pixbuf/gdk-pixbuf-marshal.h
OUT2INC
+=
gdk-pixbuf
$
/
gdk-pixbuf.h
OUT2INC
+=
gdk-pixbuf/gdk-pixbuf.h
OUT2INC
+=
gdk-pixbuf
$
/
gdk-pixbuf-core.h
OUT2INC
+=
gdk-pixbuf/gdk-pixbuf-core.h
OUT2INC
+=
gdk-pixbuf
$
/
gdk-pixbuf-io.h
OUT2INC
+=
gdk-pixbuf/gdk-pixbuf-io.h
OUT2INC
+=
gdk-pixbuf
$
/
gdk-pixbuf-simple-anim.h
OUT2INC
+=
gdk-pixbuf/gdk-pixbuf-simple-anim.h
OUT2INC
+=
gdk-pixbuf
$
/
gdk-pixdata.h
OUT2INC
+=
gdk-pixbuf/gdk-pixdata.h
OUT2INC
+=
gdk-pixbuf
$
/
gdk-pixbuf-enum-types.h
OUT2INC
+=
gdk-pixbuf/gdk-pixbuf-enum-types.h
OUT2INC
+=
gdk-pixbuf
$
/
gdk-pixbuf-loader.h
OUT2INC
+=
gdk-pixbuf/gdk-pixbuf-loader.h
OUT2INC
+=
gdk-pixbuf
$
/
gdk-pixbuf-transform.h
OUT2INC
+=
gdk-pixbuf/gdk-pixbuf-transform.h
.ELSE
.ELSE
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment