AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 02:40:11 +00:00
Code Issues Projects Releases Wiki Activity

Remove linux-fb leftovers

Browse Source 
svn path=/trunk/; revision=18113
This commit is contained in:
Matthias Clasen 2007-06-13 02:07:15 +00:00
parent 49fe3046ae
commit f7add802e2
9 changed files with 20 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-06-12 Matthias Clasen <mclasen@redhat.com>
* gdk/Makefile.am: Remove linux-fb from DIST_SUBDIRS
* configure.in: Remove linux-fb parts.
2007-06-12 Michael Natterer <mitch@imendio.com>
* gtk/gtkiconview.c (update_text_cell): use PANGO_BREAK_WORD_CHAR

45
configure.in
View File

@ -221,13 +221,13 @@ else
gdktarget=x11
fi
AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/linux-fb/win32/quartz/directfb]] select non-default GDK target],
AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target],
gdktarget=$with_gdktarget)
AC_SUBST(gdktarget)
case $gdktarget in
x11|linux-fb|win32|quartz|directfb) ;;
*) AC_MSG_ERROR([Invalid target for GDK: use x11, linux-fb, quartz, directfb or win32.]);;
x11|win32|quartz|directfb) ;;
*) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);;
esac
gdktargetlib=libgdk-$gdktarget-$GTK_API_VERSION.la
@ -236,16 +236,6 @@ gtktargetlib=libgtk-$gdktarget-$GTK_API_VERSION.la
AC_SUBST(gdktargetlib)
AC_SUBST(gtktargetlib)
AC_ARG_ENABLE(shadowfb,
[AC_HELP_STRING([--disable-shadowfb],
[disable shadowfb support for linux-fb])],,
[enable_shadowfb=yes])
AC_ARG_ENABLE(fbmanager,
[AC_HELP_STRING([--enable-fbmanager],
[enable framebuffer manager support (GtkFB)])],,
enable_fbmanager=no)
if test "x$enable_debug" = "xyes"; then
test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG -DG_ERRORCHECK_MUTEXES"
@ -1395,24 +1385,6 @@ AC_SUBST(GDK_PIXBUF_XLIB_EXTRA_CFLAGS)
AC_SUBST(GDK_PIXBUF_XLIB_DEP_LIBS)
AC_SUBST(GDK_PIXBUF_XLIB_DEP_CFLAGS)
if test "x$gdktarget" = "xlinux-fb"; then
if test x$enable_shadowfb = xyes ; then
AC_DEFINE(ENABLE_SHADOW_FB)
fi
if test x$enable_fbmanager = xyes ; then
AC_DEFINE(ENABLE_FB_MANAGER)
AM_CONDITIONAL(ENABLE_FB_MANAGER, true)
else
AM_CONDITIONAL(ENABLE_FB_MANAGER, false)
fi
AM_CONDITIONAL(USE_LINUX_FB, true)
else
AM_CONDITIONAL(USE_LINUX_FB, false)
AM_CONDITIONAL(ENABLE_FB_MANAGER, false)
fi
if test "x$gdktarget" = "xdirectfb"; then
DIRECTFB_REQUIRED_VERSION=0.9.24
AC_MSG_CHECKING(for DirectFB)
@ -1706,10 +1678,6 @@ if test "x$gdktarget" = "xx11" ; then
elif test "x$gdktarget" = "xwin32" ; then
gdk_windowing='
#define GDK_WINDOWING_WIN32'
elif test "x$gdktarget" = "xlinux-fb" ; then
gdk_windowing='
#define GDK_WINDOWING_FB
#define GDK_NATIVE_WINDOW_POINTER'
elif test "x$gdktarget" = "xquartz" ; then
gdk_windowing='
#define GDK_WINDOWING_QUARTZ'
@ -1772,7 +1740,6 @@ gdk/x11/Makefile
gdk/win32/Makefile
gdk/win32/rc/Makefile
gdk/win32/rc/gdk.rc
gdk/linux-fb/Makefile
gdk/quartz/Makefile
gdk/directfb/Makefile
gtk/Makefile
@ -1803,9 +1770,3 @@ AC_OUTPUT
echo "configuration:
target: $gdktarget"
if test "x$gdktarget" = "xlinux-fb"; then
echo "Warning: The linux-fb GDK target is unmaintained"
echo " and may not work or even compile"
fi

8
docs/reference/ChangeLog
View File

@ -1,3 +1,11 @@
2007-06-12 Matthias Clasen <mclasen@redhat.com>
* gdk/gdk-sections.txt: Remove GDK_WINDOWING_FB
* gtk/Makefile.am:
* gtk/gtk-docs.sgml:
* gtk/compiling.sgml:
* gtk/building.sgml: Remove linux-fb references
2007-06-09 Matthias Clasen <mclasen@redhat.com>
* gtk/gtk-update-icon-cache.xml: Document --validate

1
docs/reference/gdk/gdk-sections.txt
View File

@ -55,7 +55,6 @@ gdk_error_trap_pop
<SUBSECTION>
GDK_WINDOWING_X11
GDK_WINDOWING_WIN32
GDK_WINDOWING_FB
<SUBSECTION Standard>
GDK_TYPE_GRAB_STATUS

1
docs/reference/gtk/Makefile.am
View File

@ -122,7 +122,6 @@ content_files = \
changes-2.0.sgml \
compiling.sgml \
directfb.sgml \
framebuffer.sgml \
glossary.xml \
migrating-checklist.sgml \
migrating-GtkAction.sgml \

16
docs/reference/gtk/building.sgml
View File

@ -344,11 +344,7 @@ How to compile GTK+ itself
<arg>--with-xinput=[no|yes]</arg>
</group>
<group>
<arg>--with-gdktarget=[x11|linux-fb|win32|quartz|directfb]</arg>
</group>
<group>
<arg>--disable-shadowfb</arg>
<arg>--enable-shadowfb</arg>
<arg>--with-gdktarget=[x11|win32|quartz|directfb]</arg>
</group>
</cmdsynopsis>
</para>
@ -542,16 +538,6 @@ How to compile GTK+ itself
</para>
</formalpara>
<formalpara>
<title><systemitem>--disable-shadowfb</systemitem> and
<systemitem>--enable-shadowfb</systemitem></title>
<para>
Toggles shadow framebuffer support for the linux-fb target,
if selected.
</para>
</formalpara>
</refsect1>
</refentry>

8
docs/reference/gtk/compiling.sgml
View File

@ -42,14 +42,6 @@ $ cc `pkg-config --cflags --libs gtk+-2.0` hello.c -o hello
</programlisting>
</para>
<para>
To compile a GTK+ program for the framebuffer, use the
"gtk+-linux-fb-2.0" package name instead of "gtk+-2.0":
<programlisting>
$ cc `pkg-config --cflags --libs gtk+-linux-fb-2.0` hello.c -o hello
</programlisting>
</para>
<para>
If you want to make sure that your program doesn't use any deprecated
functions, you can define the preprocessor symbol GTK_DISABLE_DEPRECATED

2
docs/reference/gtk/gtk-docs.sgml
View File

@ -205,7 +205,6 @@
<!ENTITY gtk-Running SYSTEM "running.sgml">
<!ENTITY gtk-Resources SYSTEM "resources.sgml">
<!ENTITY gtk-Windows SYSTEM "windows.sgml">
<!ENTITY gtk-Framebuffer SYSTEM "framebuffer.sgml">
<!ENTITY gtk-X11 SYSTEM "x11.sgml">
<!ENTITY gtk-OSX SYSTEM "osx.sgml">
<!ENTITY gtk-DirectFB SYSTEM "directfb.sgml">
@ -317,7 +316,6 @@ that is, GUI components such as #GtkButton or #GtkTextView.
&gtk-Windows;
&gtk-OSX;
&gtk-DirectFB;
&gtk-Framebuffer;
&gtk-Resources;
&gtk-Questions;
</part>

9
gdk/Makefile.am
View File

@ -1,7 +1,7 @@
## Makefile.am for gtk+/gdk
SUBDIRS = $(gdktarget)
DIST_SUBDIRS = linux-fb win32 x11 quartz directfb
DIST_SUBDIRS = win32 x11 quartz directfb
EXTRA_DIST = \
keynames.txt \
@ -152,11 +152,6 @@ libgdk_x11_2_0_la_LIBADD = x11/libgdk-x11.la $(GDK_DEP_LIBS) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
libgdk_x11_2_0_la_LDFLAGS = $(LDADD)
libgdk_linux_fb_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
libgdk_linux_fb_2_0_la_LIBADD = linux-fb/libgdk-linux-fb.la $(GDK_DEP_LIBS) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
libgdk_linux_fb_2_0_la_LDFLAGS = $(LDADD)
libgdk_quartz_2_0_la_SOURCES = $(common_sources) gdkkeynames.c
libgdk_quartz_2_0_la_LIBADD = quartz/libgdk-quartz.la $(GDK_DEP_LIBS) \
$(top_builddir)/gdk-pixbuf/libgdk_pixbuf-$(GTK_API_VERSION).la
@ -210,7 +205,7 @@ endif
lib_LTLIBRARIES = $(gdktargetlib)
EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-linux-fb-2.0.la libgdk-win32-2.0.la libgdk-quartz-2.0.la libgdk-directfb-2.0.la
EXTRA_LTLIBRARIES = libgdk-x11-2.0.la libgdk-win32-2.0.la libgdk-quartz-2.0.la libgdk-directfb-2.0.la
MAINTAINERCLEANFILES = gdkenumtypes.h stamp-gdkenumtypes.h gdkenumtypes.c \
gdkmarshalers.h gdkmarshalers.c