diff options
Diffstat (limited to 'nonprism/california/nonprism.patch')
| -rw-r--r-- | nonprism/california/nonprism.patch | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/nonprism/california/nonprism.patch b/nonprism/california/nonprism.patch index 46d5e5147..39f96512b 100644 --- a/nonprism/california/nonprism.patch +++ b/nonprism/california/nonprism.patch @@ -147,6 +147,14 @@ diff -Nur california-0.4.0.orig/src/Makefile.am california-0.4.0/src/Makefile.am rc/activator-instance-list.ui \ rc/app-menu.interface \ rc/event-editor-attendees-card.ui \ +@@ -253,7 +245,6 @@ + --pkg libecal-1.2 \ + --pkg libical \ + --pkg libsoup-2.4 \ +- --pkg libgdata \ + --pkg Goa-1.0 \ + --pkg langinfo \ + $(NULL) diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in --- california-0.4.0.orig/src/Makefile.in 2015-03-23 21:07:56.000000000 -0300 +++ california-0.4.0/src/Makefile.in 2015-09-25 19:02:30.100517944 -0300 @@ -193,7 +201,15 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in rc/activator-instance-list.ui \ rc/app-menu.interface \ rc/event-editor-attendees-card.ui \ -@@ -932,24 +917,6 @@ +@@ -788,7 +773,6 @@ + --pkg libecal-1.2 \ + --pkg libical \ + --pkg libsoup-2.4 \ +- --pkg libgdata \ + --pkg Goa-1.0 \ + --pkg langinfo \ + $(NULL) +@@ -932,24 +916,6 @@ activator/generic/california-generic-subscribe.$(OBJEXT): \ activator/generic/$(am__dirstamp) \ activator/generic/$(DEPDIR)/$(am__dirstamp) @@ -218,7 +234,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in activator/webcal/$(am__dirstamp): @$(MKDIR_P) activator/webcal @: > activator/webcal/$(am__dirstamp) -@@ -1408,7 +1375,6 @@ +@@ -1408,7 +1374,6 @@ -rm -f activator/*.$(OBJEXT) -rm -f activator/caldav/*.$(OBJEXT) -rm -f activator/generic/*.$(OBJEXT) @@ -226,7 +242,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in -rm -f activator/webcal/*.$(OBJEXT) -rm -f application/*.$(OBJEXT) -rm -f backing/*.$(OBJEXT) -@@ -1440,10 +1406,6 @@ +@@ -1440,10 +1405,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@activator/caldav/$(DEPDIR)/california-caldav-activator-instance.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@activator/caldav/$(DEPDIR)/california-caldav-subscribe.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@activator/generic/$(DEPDIR)/california-generic-subscribe.Po@am__quote@ @@ -237,7 +253,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in @AMDEP_TRUE@@am__include@ @am__quote@activator/webcal/$(DEPDIR)/california-webcal-activator-instance.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@activator/webcal/$(DEPDIR)/california-webcal-subscribe.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@application/$(DEPDIR)/california-california-application.Po@am__quote@ -@@ -1694,62 +1656,6 @@ +@@ -1694,62 +1655,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(california_CFLAGS) $(CFLAGS) -c -o activator/generic/california-generic-subscribe.obj `if test -f 'activator/generic/generic-subscribe.c'; then $(CYGPATH_W) 'activator/generic/generic-subscribe.c'; else $(CYGPATH_W) '$(srcdir)/activator/generic/generic-subscribe.c'; fi` @@ -300,7 +316,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in activator/webcal/california-webcal-activator-instance.o: activator/webcal/webcal-activator-instance.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(california_CFLAGS) $(CFLAGS) -MT activator/webcal/california-webcal-activator-instance.o -MD -MP -MF activator/webcal/$(DEPDIR)/california-webcal-activator-instance.Tpo -c -o activator/webcal/california-webcal-activator-instance.o `test -f 'activator/webcal/webcal-activator-instance.c' || echo '$(srcdir)/'`activator/webcal/webcal-activator-instance.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) activator/webcal/$(DEPDIR)/california-webcal-activator-instance.Tpo activator/webcal/$(DEPDIR)/california-webcal-activator-instance.Po -@@ -3879,31 +3785,6 @@ +@@ -3879,31 +3784,6 @@ @if test -f $@; then :; else \ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/california_vala.stamp; \ fi @@ -332,7 +348,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in $(srcdir)/activator/webcal/webcal-subscribe.c: $(srcdir)/california_vala.stamp @if test -f $@; then :; else rm -f $(srcdir)/california_vala.stamp; fi @if test -f $@; then :; else \ -@@ -4644,9 +4525,9 @@ +@@ -4644,9 +4524,9 @@ @if test -f $@; then :; else \ $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/california_vala.stamp; \ fi @@ -344,7 +360,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in $(AM_V_at)mv -f $@-t $@ ID: $(am__tagged_files) -@@ -4771,8 +4652,6 @@ +@@ -4771,8 +4651,6 @@ -rm -f activator/caldav/$(am__dirstamp) -rm -f activator/generic/$(DEPDIR)/$(am__dirstamp) -rm -f activator/generic/$(am__dirstamp) @@ -353,7 +369,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in -rm -f activator/webcal/$(DEPDIR)/$(am__dirstamp) -rm -f activator/webcal/$(am__dirstamp) -rm -f application/$(DEPDIR)/$(am__dirstamp) -@@ -4824,10 +4703,6 @@ +@@ -4824,10 +4702,6 @@ -rm -f $(srcdir)/activator/caldav/caldav-activator-instance.c -rm -f $(srcdir)/activator/caldav/caldav-subscribe.c -rm -f $(srcdir)/activator/generic/generic-subscribe.c @@ -364,7 +380,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in -rm -f $(srcdir)/activator/webcal/webcal-activator-instance.c -rm -f $(srcdir)/activator/webcal/webcal-subscribe.c -rm -f $(srcdir)/application/california-application.c -@@ -4984,10 +4859,6 @@ +@@ -4984,10 +4858,6 @@ -rm -f activator/caldav/caldav-activator-instance.c -rm -f activator/caldav/caldav-subscribe.c -rm -f activator/generic/generic-subscribe.c @@ -375,7 +391,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in -rm -f activator/webcal/webcal-activator-instance.c -rm -f activator/webcal/webcal-subscribe.c -rm -f application/california-application.c -@@ -5142,7 +5013,7 @@ +@@ -5142,7 +5012,7 @@ clean-am: clean-binPROGRAMS clean-generic mostlyclean-am distclean: distclean-am @@ -384,7 +400,7 @@ diff -Nur california-0.4.0.orig/src/Makefile.in california-0.4.0/src/Makefile.in -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags -@@ -5188,7 +5059,7 @@ +@@ -5188,7 +5058,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am |