From e26cecf664b2bb8b445d389e8524c49c9d8a581d Mon Sep 17 00:00:00 2001 From: "Andreas.Fink85" Date: Fri, 11 Jun 2010 15:37:53 +0000 Subject: [PATCH] *del* autoconf files not used anymore *add* install tint2conf .desktop and pixmaps *fix* tint2conf warnings git-svn-id: http://tint2.googlecode.com/svn/trunk@478 121b4492-b84c-0410-8b4c-0d4edfb3f3cc --- ChangeLog | 3 + Makefile.am | 17 ----- NEWS | 0 autogen.sh | 5 -- configure.ac | 143 ----------------------------------- doc/Makefile.am | 3 - sample/Makefile.am | 27 ------- src/Makefile.am | 43 ----------- src/tint2conf/CMakeLists.txt | 2 + src/tint2conf/Makefile.am | 9 --- src/tint2conf/main.c | 10 +-- src/version.h.in | 3 - 12 files changed, 10 insertions(+), 255 deletions(-) delete mode 100644 Makefile.am delete mode 100644 NEWS delete mode 100755 autogen.sh delete mode 100644 configure.ac delete mode 100644 doc/Makefile.am delete mode 100644 sample/Makefile.am delete mode 100644 src/Makefile.am delete mode 100644 src/tint2conf/Makefile.am delete mode 100644 src/version.h.in diff --git a/ChangeLog b/ChangeLog index e78cf61..9f4b254 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2010-06-09 +- Add cmake build system + 2010-05-17 - Fix installation of examples diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index f3fcedf..0000000 --- a/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -ACLOCAL_AMFLAGS = -I m4 - -SUBDIRS = doc sample src -dist_doc_DATA = AUTHORS ChangeLog NEWS README -EXTRA_DIST = autogen.sh README.source - -dist_pkgdata_DATA = default_icon.png - -DISTCLEANFILES += configure depcomp config.guess config.sub config.h.in config.h.in~ ltmain.sh missing aclocal.m4 install-sh INSTALL - -dist-hook: - find $(distdir)/ -type d -name '.svn' -exec rm -rf {} ';' - -distclean-local: distclean-local-check - -distclean-local-check: - -rm -rf autom4te.cache m4 diff --git a/NEWS b/NEWS deleted file mode 100644 index e69de29..0000000 diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 3ef543f..0000000 --- a/autogen.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -[ ! -d m4 ] && mkdir m4 - -autoreconf -i -s -f -v diff --git a/configure.ac b/configure.ac deleted file mode 100644 index b92bb4e..0000000 --- a/configure.ac +++ /dev/null @@ -1,143 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. -AC_PREREQ([2.61]) -AC_INIT([tint2], [0.10-svn], [http://code.google.com/p/tint2/issues]) - -AM_INIT_AUTOMAKE - -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR([src/tint.c]) -AC_CONFIG_HEADERS([config.h]) - -# tint2 -AC_ARG_ENABLE([battery], - [AS_HELP_STRING([--disable-battery], [Disable battery status plugin])], - [case "${enableval}" in - yes) battery=true ;; - no) battery=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --disable-battery]) ;; - esac], [battery=true]) -AM_CONDITIONAL([ENABLE_BATTERY], [test x$battery = xtrue]) -# - -AC_ARG_ENABLE([examples], - [AS_HELP_STRING([--enable-examples], [Install additional tin2rc examples])], - [case "${enableval}" in - yes) examples=true ;; - no) examples=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-examples]) ;; - esac],[examples=false]) -AM_CONDITIONAL([INSTALL_EXAMPLES], [test x$examples = xtrue]) - -# tint2conf -AC_ARG_ENABLE([tint2conf], - [AS_HELP_STRING([--disable-tint2conf], [Disable tint2conf build, a GTK+2 theme switcher for tint2])], - [case "${enableval}" in - yes) tint2conf=true ;; - no) tint2conf=false ;; - *) AC_MSG_ERROR([bad value ${enableval} for --disable-tint2conf]) ;; - esac],[tint2conf=true]) -AM_CONDITIONAL([ENABLE_TINT2CONF], [test x$tint2conf = xtrue]) -# - -# Checks for programs. -AC_LANG([C]) -AC_PROG_CC -PKG_PROG_PKG_CONFIG - -# Checks for libraries. -PKG_CHECK_MODULES([PANGOCAIRO], [pangocairo]) -AC_SUBST(PANGOCAIRO_CFLAGS) -AC_SUBST(PANGOCAIRO_LIBS) - -PKG_CHECK_MODULES([PANGO], [pango]) -AC_SUBST(PANGO_CFLAGS) -AC_SUBST(PANGO_LIBS) - -PKG_CHECK_MODULES([CAIRO], [cairo]) -AC_SUBST(CAIRO_CFLAGS) -AC_SUBST(CAIRO_LIBS) - -PKG_CHECK_MODULES([GLIB2], [glib-2.0]) -AC_SUBST(GLIB2_CFLAGS) -AC_SUBST(GLIB2_LIBS) - -PKG_CHECK_MODULES([GOBJECT2], [gobject-2.0]) -AC_SUBST(GOBJECT2_CFLAGS) -AC_SUBST(GOBJECT2_LIBS) - -PKG_CHECK_MODULES([X11], [x11 xcomposite xdamage xinerama xrender xrandr]) -AC_SUBST(X11_CFLAGS) -AC_SUBST(X11_LIBS) - -PKG_CHECK_MODULES([IMLIB2], [imlib2]) -AC_SUBST(IMLIB2_CFLAGS) -AC_SUBST(IMLIB2_LIBS) - -# Reset LIBS since AC_CHECK_LIB adds -lmylib on success -LIBS_SAVED=$LIBS -# Ensure that Imlib2 has been built with X support. -AC_CHECK_LIB([Imlib2], [imlib_context_set_display], [], - AC_MSG_ERROR([Imlib2 must be built with X support])) - -AC_CHECK_LIB([rt], [clock_gettime]) -LIBS=$LIBS_SAVED - -# Checks for header files. -AC_PATH_X -AC_CHECK_HEADERS([fcntl.h locale.h stdint.h stdlib.h string.h sys/time.h unistd.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_HEADER_STDBOOL -AC_TYPE_INT16_T -AC_TYPE_INT64_T -AC_TYPE_INT8_T -AC_TYPE_PID_T - -# Checks for library functions. -AC_FUNC_FORK -AC_FUNC_MALLOC -AC_FUNC_REALLOC -AC_CHECK_FUNCS([clock_gettime gettimeofday memset select setenv setlocale strcasecmp strchr strdup strstr]) - -# tint2conf (experimental) -if test "x$tint2conf" = xtrue; -then - # We want just link against stuff we really need so thats why I don't use PKG_CHECK_MODULES. - # gtk/glib is a bit horrible because we have to add -I directives for various features (like cairo, pango etc.) - # even if we don't need them. - # Sorry if that might be confusing %-) - - AC_CHECK_FUNCS([strndup strrchr]) - PKG_CHECK_MODULES([TINT2CONF], [x11 xrender imlib2 gobject-2.0 glib-2.0 gthread-2.0 gtk+-x11-2.0]) - AC_SUBST(TINT2CONF_CFLAGS) - AC_SUBST(TINT2CONF_LIBS) - - # Python stuff - AC_PATH_PROG([__PYTHON], [python]) - if test -z "${__PYTHON}"; - then - AC_MSG_ERROR([tint2conf requires python to be installed]) - fi - - PKG_CHECK_EXISTS([pygtk-2.0],,[AC_MSG_ERROR([tint2conf requires >=pygtk-2.0])]) -fi -# - -# -AM_CFLAGS="-Wall" -AM_LDFLAGS="-Wl,--as-needed" -AC_SUBST(AM_CFLAGS) -AC_SUBST(AM_LDFLAGS) - -DISTCLEANFILES="Makefile.in" -AC_SUBST(DISTCLEANFILES) - -AC_CONFIG_FILES([Makefile - doc/Makefile - sample/Makefile - src/Makefile - src/tint2conf/Makefile - src/version.h]) - -AC_OUTPUT diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index c339e79..0000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -man1_MANS = $(PACKAGE_NAME).1 - -EXTRA_DIST = $(man1_MANS) diff --git a/sample/Makefile.am b/sample/Makefile.am deleted file mode 100644 index a8555a0..0000000 --- a/sample/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -rcdir = $(sysconfdir)/xdg/$(PACKAGE_NAME) - -dist_rc_DATA = tint2rc - -if INSTALL_EXAMPLES -examplesdir = $(docdir)/examples -dist_examples_DATA = icon_and_text_1.tint2rc \ - icon_and_text_2.tint2rc \ - icon_and_text_3.tint2rc \ - icon_and_text_4.tint2rc \ - icon_only_1.tint2rc \ - icon_only_2.tint2rc \ - icon_only_3.tint2rc \ - icon_only_4.tint2rc \ - icon_only_6.tint2rc \ - icon_only_7.tint2rc \ - text_only_1.tint2rc \ - text_only_2.tint2rc \ - text_only_3.tint2rc \ - text_only_4.tint2rc \ - text_only_5.tint2rc \ - text_only_6.tint2rc -else -examplesdir = -dist_examples_DATA = -endif - diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 99a53a3..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -if ENABLE_TINT2CONF -SUBDIRS = tint2conf -endif - -AM_CFLAGS += @PANGOCAIRO_CFLAGS@ @PANGO_CFLAGS@ @CAIRO_CFLAGS@ @GLIB2_CFLAGS@ @GOBJECT2_CFLAGS@ @X11_CFLAGS@ @IMLIB2_CFLAGS@ -LIBS = @PANGOCAIRO_LIBS@ @PANGO_LIBS@ @CAIRO_LIBS@ @GLIB2_LIBS@ @GOBJECT2_LIBS@ @X11_LIBS@ @IMLIB2_LIBS@ -lrt -INCLUDES = -Iutil -Iclock -Itaskbar -Isystray -Itooltip - -bin_PROGRAMS = tint2 -tint2_SOURCES = config.c \ - util/area.h \ - util/common.h \ - util/common.c \ - util/area.c \ - util/window.h \ - util/window.c \ - util/timer.h \ - util/timer.c \ - panel.h \ - clock/clock.c \ - clock/clock.h \ - config.h \ - tint.c \ - panel.c \ - server.c \ - server.h \ - systray/systraybar.h \ - systray/systraybar.c \ - taskbar/taskbar.c \ - taskbar/task.c \ - taskbar/taskbar.h \ - taskbar/task.h \ - tooltip/tooltip.c \ - tooltip/tooltip.h \ - version.h - -if ENABLE_BATTERY -DEFS += -DENABLE_BATTERY -INCLUDES += -Ibattery -tint2_SOURCES += battery/battery.c \ - battery/battery.h -endif - diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt index c092ecc..03b032b 100644 --- a/src/tint2conf/CMakeLists.txt +++ b/src/tint2conf/CMakeLists.txt @@ -33,3 +33,5 @@ set_target_properties(tint2conf PROPERTIES LINK_FLAGS -Wl,--as-needed) install( TARGETS tint2conf DESTINATION bin ) install( PROGRAMS tintwizard.py DESTINATION bin ) +install( FILES tint2conf.png tint2conf.svg DESTINATION share/pixmaps ) +install( FILES tint2conf.desktop DESTINATION share/applications ) diff --git a/src/tint2conf/Makefile.am b/src/tint2conf/Makefile.am deleted file mode 100644 index c76dc92..0000000 --- a/src/tint2conf/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -if ENABLE_TINT2CONF -bin_PROGRAMS = tint2conf -dist_bin_SCRIPTS = tintwizard.py -tint2conf_SOURCES = main.c theme_view.c theme_view.h ../util/common.c ../version.h -INCLUDES = -I../util - -AM_CFLAGS += @TINT2CONF_CFLAGS@ -LIBS += @TINT2CONF_LIBS@ -endif diff --git a/src/tint2conf/main.c b/src/tint2conf/main.c index d419e46..135b761 100644 --- a/src/tint2conf/main.c +++ b/src/tint2conf/main.c @@ -192,7 +192,7 @@ static void menuAbout() { const char *authors[] = { "Thierry Lorthiois ", "Andreas Fink ", "Christian Ruppert (Build system)", "Euan Freeman (tintwizard)\n See http://code.google.com/p/tintwizard/", NULL }; - gtk_show_about_dialog(g_window, "name", g_get_application_name( ), + gtk_show_about_dialog(GTK_WINDOW(g_window), "name", g_get_application_name( ), "comments", _("Theming tool for tint2 panel"), "version", VERSION_STRING, "copyright", _("Copyright 2009 tint2 team\nTint2 License GNU GPL version 2\nTintwizard License GNU GPL version 3"), @@ -211,7 +211,7 @@ static void menuAdd() GtkFileChooser *chooser; GtkFileFilter *filter; - dialog = gtk_file_chooser_dialog_new(_("Add a theme"), g_window, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT, NULL); + dialog = gtk_file_chooser_dialog_new(_("Add a theme"), GTK_WINDOW(g_window), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_ADD, GTK_RESPONSE_ACCEPT, NULL); chooser = GTK_FILE_CHOOSER(dialog); gtk_file_chooser_set_current_folder(chooser, g_get_home_dir()); @@ -246,7 +246,7 @@ static void menuAdd() gchar *message; message = g_strdup_printf(_("Couldn't add duplicate theme\n\'%s\'."), pt1); - GtkWidget *w = gtk_message_dialog_new(g_window, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, message, NULL); + GtkWidget *w = gtk_message_dialog_new(GTK_WINDOW(g_window), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, message, NULL); g_signal_connect_swapped(w, "response", G_CALLBACK(gtk_widget_destroy), w); gtk_widget_show(w); g_free(message); @@ -282,7 +282,7 @@ static void menuSaveAs () sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_theme_view)); if (!gtk_tree_selection_get_selected(GTK_TREE_SELECTION(sel), &model, &iter)) { - GtkWidget *w = gtk_message_dialog_new(g_window, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Select the theme to be saved."), NULL); + GtkWidget *w = gtk_message_dialog_new(GTK_WINDOW(g_window), 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Select the theme to be saved.")); g_signal_connect_swapped(w, "response", G_CALLBACK(gtk_widget_destroy), w); gtk_widget_show(w); return; @@ -292,7 +292,7 @@ static void menuSaveAs () pt1 = strrchr (file, '/'); if (pt1) pt1++; - dialog = gtk_file_chooser_dialog_new(_("Save theme as"), g_window, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); + dialog = gtk_file_chooser_dialog_new(_("Save theme as"), GTK_WINDOW(g_window), GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); chooser = GTK_FILE_CHOOSER(dialog); gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE); diff --git a/src/version.h.in b/src/version.h.in deleted file mode 100644 index a1c6b86..0000000 --- a/src/version.h.in +++ /dev/null @@ -1,3 +0,0 @@ - -#define VERSION_STRING "@PACKAGE_VERSION@" -