summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDJ Lucas2015-12-04 01:10:42 -0600
committerDJ Lucas2015-12-04 01:10:42 -0600
commitfa57be67db90e04bd7b89fe12de8adddc06bb0bc (patch)
tree6ba5a2bfe4cd28bcbddca69e1d2ba27a14b56363
parent7ed11d7a3c38eb00ae44dbc8a1047ac93e9b5eac (diff)
downloadaur-fa57be67db90e04bd7b89fe12de8adddc06bb0bc.tar.gz
Return to openchange from openchange-git, remove unneeded patch
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD7
-rw-r--r--UI_MailPartViewers_GNUmakefile.patch31
3 files changed, 4 insertions, 40 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4849b558a26..85a6954190d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = sogo
pkgver = 2.3.3a
- pkgrel = 2
+ pkgrel = 3
url = http://www.sogo.nu/
arch = i686
arch = x86_64
@@ -13,12 +13,10 @@ pkgbase = sogo
options = !strip
source = http://www.sogo.nu/files/downloads/SOGo/Sources/SOGo-2.3.3a.tar.gz
source = sogo_configure.patch
- source = UI_MailPartViewers_GNUmakefile.patch
source = sogo.service
source = sogo.confd
sha256sums = cc0ed55f30ef889d8d7f2d55b48066a501e9285317e0dfc63e0a12235a68382c
sha256sums = e64ea4aa0ddf29785de8d786ab7ab09f940bfe316b6f1deeb8d04d9d16d35db1
- sha256sums = ef6ab2829d35c2abb5529ee8ea9a4cc541913b0a82bc91f4c9fa21c65d44a4aa
sha256sums = 0720b9ad35a05d86d794c7adbf18277ecde57ed147e96f6105acca93f19d3b8c
sha256sums = 8ee0d1ad77e998ea801053fce175d8c4a1c55dcc5ee1ff78f0a8e3797187a6a7
@@ -46,7 +44,7 @@ pkgname = sogo
pkgname = sogo-openchange
pkgdesc = OpenChange module for SOGo
depends = sogo=2.3.3a
- depends = openchange-git
+ depends = openchange
pkgname = sogo-activesync
pkgdesc = ActiveSync module for SOGo
diff --git a/PKGBUILD b/PKGBUILD
index ca06b243724..64534d03d83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=('sogo'
'sogo-openchange'
'sogo-activesync')
pkgver=2.3.3a
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
url="http://www.sogo.nu/"
license=('GPL')
@@ -18,7 +18,6 @@ options=('!strip')
source=(
http://www.sogo.nu/files/downloads/SOGo/Sources/SOGo-${pkgver}.tar.gz
sogo_configure.patch
- UI_MailPartViewers_GNUmakefile.patch
sogo.service
sogo.confd
)
@@ -26,7 +25,6 @@ source=(
prepare() {
cd "$srcdir/SOGo-${pkgver}"
patch configure ../sogo_configure.patch
- patch -p1 < ../UI_MailPartViewers_GNUmakefile.patch
}
build() {
@@ -73,7 +71,7 @@ install=sogo.install
package_sogo-openchange() {
pkgdesc="OpenChange module for SOGo"
-depends=("sogo=${pkgver}" 'openchange-git')
+depends=("sogo=${pkgver}" 'openchange')
cd "${srcdir}/SOGo-${pkgver}/OpenChange"
sed 's@-Wall@-Wall -fobjc-exceptions@' -i GNUmakefile
@@ -90,7 +88,6 @@ depends=("sogo=${pkgver}" 'libwbxml')
sha256sums=('cc0ed55f30ef889d8d7f2d55b48066a501e9285317e0dfc63e0a12235a68382c'
'e64ea4aa0ddf29785de8d786ab7ab09f940bfe316b6f1deeb8d04d9d16d35db1'
- 'ef6ab2829d35c2abb5529ee8ea9a4cc541913b0a82bc91f4c9fa21c65d44a4aa'
'0720b9ad35a05d86d794c7adbf18277ecde57ed147e96f6105acca93f19d3b8c'
'8ee0d1ad77e998ea801053fce175d8c4a1c55dcc5ee1ff78f0a8e3797187a6a7')
diff --git a/UI_MailPartViewers_GNUmakefile.patch b/UI_MailPartViewers_GNUmakefile.patch
deleted file mode 100644
index f9c884f8731..00000000000
--- a/UI_MailPartViewers_GNUmakefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/UI/MailPartViewers/GNUmakefile b/UI/MailPartViewers/GNUmakefile
-index a094e92..c82bf6f 100644
---- a/UI/MailPartViewers/GNUmakefile
-+++ b/UI/MailPartViewers/GNUmakefile
-@@ -25,7 +25,25 @@ MailPartViewers_OBJC_FILES += \
- UIxMailPartMessageViewer.m \
- UIxMailPartICalViewer.m \
- \
-- UIxMailPartICalActions.m
-+ UIxMailPartICalActions.m \
-+ ../../SoObjects/Mailer/SOGoMailBodyPart.m \
-+ ../../SoObjects/Mailer/SOGoHTMLMailBodyPart.m \
-+ ../../SoObjects/Mailer/SOGoCalendarMailBodyPart.m \
-+ ../../SoObjects/Mailer/SOGoMailAccounts.m \
-+ ../../SoObjects/Mailer/SOGoMailBaseObject.m \
-+ ../../SoObjects/Mailer/SOGoMailAccount.m \
-+ ../../SoObjects/Mailer/SOGoMailNamespace.m \
-+ ../../SoObjects/Mailer/SOGoDraftsFolder.m \
-+ ../../SoObjects/Mailer/SOGoSentFolder.m \
-+ ../../SoObjects/Mailer/SOGoTrashFolder.m \
-+ ../../SoObjects/Mailer/SOGoMailFolder.m \
-+ ../../SoObjects/Mailer/SOGoDraftObject.m \
-+ ../../SoObjects/Mailer/SOGoMailObject.m \
-+ ../../SoObjects/Appointments/SOGoEMailAlarmsManager.m \
-+ ../../SoObjects/Appointments/SOGoAppointmentObject.m \
-+ ../../SoObjects/Appointments/SOGoComponentOccurence.m \
-+ ../../SoObjects/Appointments/SOGoAppointmentOccurence.m \
-+ ../../SoObjects/Appointments/SOGoCalendarComponent.m
-
- MailPartViewers_RESOURCE_FILES += \
- product.plist \