File orage-shared-libical.patch of Package orage

Overview Repositories Revisions Requests Users Attributes Meta

File orage-shared-libical.patch of Package orage (Revision c528c37a4d634455494f1332f7e00053)

Currently displaying revision c528c37a4d634455494f1332f7e00053 , Show latest

--- Makefile.am
+++ Makefile.am
@@ -1,12 +1,6 @@
 # $Id: Makefile.am 24778 2007-01-28 19:03:47Z juha $
 
-if INCLUDED_LIBICAL
-LIBICAL_SUBDIR=								\
-	libical
-endif
-
 SUBDIRS = 								\
-	$(LIBICAL_SUBDIR)						\
 	doc								\
 	icons								\
 	po								\
--- Makefile.in
+++ Makefile.in
@@ -74,7 +74,7 @@
 DATA = $(desktop_DATA) $(service_DATA)
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = libical doc icons po sounds src panel-plugin globaltime \
+DIST_SUBDIRS = doc icons po sounds src panel-plugin globaltime \
 	plugin
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -140,8 +140,6 @@
 HAVE_NOTIFY_TRUE = @HAVE_NOTIFY_TRUE@
 HAVE_PTHREAD_FALSE = @HAVE_PTHREAD_FALSE@
 HAVE_PTHREAD_TRUE = @HAVE_PTHREAD_TRUE@
-INCLUDED_LIBICAL_FALSE = @INCLUDED_LIBICAL_FALSE@
-INCLUDED_LIBICAL_TRUE = @INCLUDED_LIBICAL_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -275,11 +273,8 @@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-@INCLUDED_LIBICAL_TRUE@LIBICAL_SUBDIR = \
-@INCLUDED_LIBICAL_TRUE@	libical
 
 SUBDIRS = \
-	$(LIBICAL_SUBDIR)						\
 	doc								\
 	icons								\
 	po								\
@@ -552,7 +547,7 @@
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/libical/src/libical $(distdir)/po
+	$(mkdir_p) $(distdir)/. $(distdir)/po
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
--- configure
+++ configure
@@ -470,7 +470,7 @@
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP HAVE_CYGWIN_TRUE HAVE_CYGWIN_FALSE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC LEX LEXLIB LEX_OUTPUT_ROOT PERL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS localedir XGETTEXT_ARGS PKG_CONFIG LIBXFCEGUI4_VERSION LIBXFCEGUI4_CFLAGS LIBXFCEGUI4_LIBS LIBXFCEGUI4_REQUIRED_VERSION LIBXFCE4PANEL_VERSION LIBXFCE4PANEL_CFLAGS LIBXFCE4PANEL_LIBS LIBXFCE4PANEL_REQUIRED_VERSION BDB_DIR BDB_DIR_INCLUDE BDB_DIR_LIB BDB_LIB BDB_VERSION PTHREAD_LIBS INCLUDED_LIBICAL_TRUE INCLUDED_LIBICAL_FALSE HAVE_PTHREAD_TRUE HAVE_PTHREAD_FALSE WITH_BDB4_TRUE WITH_BDB4_FALSE DBUS_VERSION DBUS_CFLAGS DBUS_LIBS DBUS_REQUIRED_VERSION HAVE_DBUS_TRUE HAVE_DBUS_FALSE NOTIFY_VERSION NOTIFY_CFLAGS NOTIFY_LIBS NOTIFY_REQUIRED_VERSION HAVE_NOTIFY_TRUE HAVE_NOTIFY_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP HAVE_CYGWIN_TRUE HAVE_CYGWIN_FALSE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT ALL_LINGUAS LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL YACC LEX LEXLIB LEX_OUTPUT_ROOT PERL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS localedir XGETTEXT_ARGS PKG_CONFIG LIBXFCEGUI4_VERSION LIBXFCEGUI4_CFLAGS LIBXFCEGUI4_LIBS LIBXFCEGUI4_REQUIRED_VERSION LIBXFCE4PANEL_VERSION LIBXFCE4PANEL_CFLAGS LIBXFCE4PANEL_LIBS LIBXFCE4PANEL_REQUIRED_VERSION BDB_DIR BDB_DIR_INCLUDE BDB_DIR_LIB BDB_LIB BDB_VERSION PTHREAD_LIBS HAVE_PTHREAD_TRUE HAVE_PTHREAD_FALSE WITH_BDB4_TRUE WITH_BDB4_FALSE DBUS_VERSION DBUS_CFLAGS DBUS_LIBS DBUS_REQUIRED_VERSION HAVE_DBUS_TRUE HAVE_DBUS_FALSE NOTIFY_VERSION NOTIFY_CFLAGS NOTIFY_LIBS NOTIFY_REQUIRED_VERSION HAVE_NOTIFY_TRUE HAVE_NOTIFY_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -23291,8 +23291,6 @@
   fi
 
 
-ac_INCLUDED_LIBICAL=yes
-
 echo "$as_me:$LINENO: checking for Berkeley DB4 support" >&5
 echo $ECHO_N "checking for Berkeley DB4 support... $ECHO_C" >&6
 
@@ -23495,17 +23493,6 @@
 
 
 
-
-if test x"$ac_INCLUDED_LIBICAL" = x"yes"; then
-  INCLUDED_LIBICAL_TRUE=
-  INCLUDED_LIBICAL_FALSE='#'
-else
-  INCLUDED_LIBICAL_TRUE='#'
-  INCLUDED_LIBICAL_FALSE=
-fi
-
-
-
 if test x"$have_pthread" = x"yes"; then
   HAVE_PTHREAD_TRUE=
   HAVE_PTHREAD_FALSE='#'
@@ -23958,7 +23945,7 @@
   fi
 
 
-                                                                                                                                                                                                                                      ac_config_files="$ac_config_files Makefile libical/Makefile libical/design-data/Makefile libical/doc/Makefile libical/scripts/Makefile libical/src/Makefile libical/src/libical/Makefile libical/src/libical/icalversion.h libical/src/libicalss/Makefile libical/zoneinfo/Makefile xfcalendar.spec icons/Makefile icons/48x48/Makefile icons/scalable/Makefile po/Makefile.in sounds/Makefile src/Makefile plugin/Makefile doc/Makefile doc/C/Makefile doc/C/images/Makefile panel-plugin/Makefile globaltime/Makefile"
+                                                                                                                                                                                                                                      ac_config_files="$ac_config_files Makefile xfcalendar.spec icons/Makefile icons/48x48/Makefile icons/scalable/Makefile po/Makefile.in sounds/Makefile src/Makefile plugin/Makefile doc/Makefile doc/C/Makefile doc/C/images/Makefile panel-plugin/Makefile globaltime/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -24096,13 +24083,6 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${INCLUDED_LIBICAL_TRUE}" && test -z "${INCLUDED_LIBICAL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"INCLUDED_LIBICAL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"INCLUDED_LIBICAL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${HAVE_PTHREAD_TRUE}" && test -z "${HAVE_PTHREAD_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"HAVE_PTHREAD\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -24582,15 +24562,6 @@
   case "$ac_config_target" in
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "libical/Makefile" ) CONFIG_FILES="$CONFIG_FILES libical/Makefile" ;;
-  "libical/design-data/Makefile" ) CONFIG_FILES="$CONFIG_FILES libical/design-data/Makefile" ;;
-  "libical/doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES libical/doc/Makefile" ;;
-  "libical/scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES libical/scripts/Makefile" ;;
-  "libical/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES libical/src/Makefile" ;;
-  "libical/src/libical/Makefile" ) CONFIG_FILES="$CONFIG_FILES libical/src/libical/Makefile" ;;
-  "libical/src/libical/icalversion.h" ) CONFIG_FILES="$CONFIG_FILES libical/src/libical/icalversion.h" ;;
-  "libical/src/libicalss/Makefile" ) CONFIG_FILES="$CONFIG_FILES libical/src/libicalss/Makefile" ;;
-  "libical/zoneinfo/Makefile" ) CONFIG_FILES="$CONFIG_FILES libical/zoneinfo/Makefile" ;;
   "xfcalendar.spec" ) CONFIG_FILES="$CONFIG_FILES xfcalendar.spec" ;;
   "icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;;
   "icons/48x48/Makefile" ) CONFIG_FILES="$CONFIG_FILES icons/48x48/Makefile" ;;
@@ -24833,8 +24804,6 @@
 s,@BDB_LIB@,$BDB_LIB,;t t
 s,@BDB_VERSION@,$BDB_VERSION,;t t
 s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
-s,@INCLUDED_LIBICAL_TRUE@,$INCLUDED_LIBICAL_TRUE,;t t
-s,@INCLUDED_LIBICAL_FALSE@,$INCLUDED_LIBICAL_FALSE,;t t
 s,@HAVE_PTHREAD_TRUE@,$HAVE_PTHREAD_TRUE,;t t
 s,@HAVE_PTHREAD_FALSE@,$HAVE_PTHREAD_FALSE,;t t
 s,@WITH_BDB4_TRUE@,$WITH_BDB4_TRUE,;t t
--- src/Makefile.am
+++ src/Makefile.am
@@ -31,29 +31,16 @@
 
 orage_CFLAGS =							\
 	$(LIBXFCEGUI4_CFLAGS)						\
-	$(ICAL_CFLAGS)							\
+	-I/usr/include/libical					\
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\"				\
 	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\"
 
 orage_LDADD =							\
 	$(LIBXFCEGUI4_LIBS)						\
 	$(LIBXFCEUTIL_LIBS)						\
-	$(ICAL_LIBS)							\
+	-lical -licalss							\
 	$(INTLLIBS)
 
-if INCLUDED_LIBICAL
-orage_CFLAGS +=							\
-	-I$(top_builddir)/libical/src/libical				\
-	-I$(top_builddir)/libical/src/libicalss				\
-	-I$(top_srcdir)/libical/src/libical				\
-	-I$(top_srcdir)/libical/src/libicalss
-
-orage_LDADD +=							\
-	$(PTHREAD_LIBS)							\
-	$(top_builddir)/libical/src/libical/libical.la			\
-	$(top_builddir)/libical/src/libicalss/libicalss.la
-endif
-
 if HAVE_DBUS
 orage_dbus_sources =						\
 	orage-dbus-object.c						\
--- src/Makefile.in
+++ src/Makefile.in
@@ -38,16 +38,6 @@
 host_triplet = @host@
 target_triplet = @target@
 bin_PROGRAMS = orage$(EXEEXT)
-@INCLUDED_LIBICAL_TRUE@am__append_1 = \
-@INCLUDED_LIBICAL_TRUE@	-I$(top_builddir)/libical/src/libical				\
-@INCLUDED_LIBICAL_TRUE@	-I$(top_builddir)/libical/src/libicalss				\
-@INCLUDED_LIBICAL_TRUE@	-I$(top_srcdir)/libical/src/libical				\
-@INCLUDED_LIBICAL_TRUE@	-I$(top_srcdir)/libical/src/libicalss
-
-@INCLUDED_LIBICAL_TRUE@am__append_2 = \
-@INCLUDED_LIBICAL_TRUE@	$(PTHREAD_LIBS)							\
-@INCLUDED_LIBICAL_TRUE@	$(top_builddir)/libical/src/libical/libical.la			\
-@INCLUDED_LIBICAL_TRUE@	$(top_builddir)/libical/src/libicalss/libicalss.la
 
 @HAVE_DBUS_TRUE@am__append_3 = \
 @HAVE_DBUS_TRUE@	-DDBUS_API_SUBJECT_TO_CHANGE					\
@@ -91,9 +81,6 @@
 	orage-tray_icon.$(OBJEXT) orage-xfce_trayicon.$(OBJEXT)
 orage_OBJECTS = $(am_orage_OBJECTS)
 am__DEPENDENCIES_1 =
-@INCLUDED_LIBICAL_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
-@INCLUDED_LIBICAL_TRUE@	$(top_builddir)/libical/src/libical/libical.la \
-@INCLUDED_LIBICAL_TRUE@	$(top_builddir)/libical/src/libicalss/libicalss.la
 @HAVE_DBUS_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
 @HAVE_NOTIFY_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
 orage_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -168,8 +155,6 @@
 HAVE_NOTIFY_TRUE = @HAVE_NOTIFY_TRUE@
 HAVE_PTHREAD_FALSE = @HAVE_PTHREAD_FALSE@
 HAVE_PTHREAD_TRUE = @HAVE_PTHREAD_TRUE@
-INCLUDED_LIBICAL_FALSE = @INCLUDED_LIBICAL_FALSE@
-INCLUDED_LIBICAL_TRUE = @INCLUDED_LIBICAL_TRUE@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -332,11 +317,11 @@
 	xfce_trayicon.c							\
 	xfce_trayicon.h
 
-orage_CFLAGS = $(LIBXFCEGUI4_CFLAGS) $(ICAL_CFLAGS) \
+orage_CFLAGS = $(LIBXFCEGUI4_CFLAGS) -I/usr/include/libical \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" $(am__append_1) \
 	$(am__append_3)
-orage_LDADD = $(LIBXFCEGUI4_LIBS) $(LIBXFCEUTIL_LIBS) $(ICAL_LIBS) \
+orage_LDADD = $(LIBXFCEGUI4_LIBS) $(LIBXFCEUTIL_LIBS) -lical -licalss \
 	$(INTLLIBS) $(am__append_2) $(am__append_4) $(am__append_5)
 @HAVE_DBUS_TRUE@orage_dbus_sources = \
 @HAVE_DBUS_TRUE@	orage-dbus-object.c						\

Places

File orage-shared-libical.patch of Package orage (Revision c528c37a4d634455494f1332f7e00053)

Places