|
|
sogo-fix-selectors.diff (3,410 bytes)
$OpenBSD$
--- SOPE/GDLContentStore/EOQualifier+GCS.m.orig Wed Feb 6 12:51:46 2013
+++ SOPE/GDLContentStore/EOQualifier+GCS.m Wed Feb 6 12:52:26 2013
@@ -27,10 +27,6 @@
#import "EOQualifier+GCS.h"
-#if __GNU_LIBOBJC__ >= 20100911
-# define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
-#endif
-
@implementation EOQualifier(GCS)
- (void)_appendAndQualifier:(EOAndQualifier *)_q
@@ -92,21 +88,21 @@
val = [_q value];
if (val && [val isNotNull]) {
- if (sel_eq(op, EOQualifierOperatorEqual))
+ if (sel_isEqual(op, EOQualifierOperatorEqual))
qOperator = @"=";
- else if (sel_eq(op, EOQualifierOperatorNotEqual))
+ else if (sel_isEqual(op, EOQualifierOperatorNotEqual))
qOperator = @"!=";
- else if (sel_eq(op, EOQualifierOperatorLessThan))
+ else if (sel_isEqual(op, EOQualifierOperatorLessThan))
qOperator = @"<";
- else if (sel_eq(op, EOQualifierOperatorGreaterThan))
+ else if (sel_isEqual(op, EOQualifierOperatorGreaterThan))
qOperator = @">";
- else if (sel_eq(op, EOQualifierOperatorLessThanOrEqualTo))
+ else if (sel_isEqual(op, EOQualifierOperatorLessThanOrEqualTo))
qOperator = @"<=";
- else if (sel_eq(op, EOQualifierOperatorGreaterThanOrEqualTo))
+ else if (sel_isEqual(op, EOQualifierOperatorGreaterThanOrEqualTo))
qOperator = @">=";
- else if (sel_eq(op, EOQualifierOperatorLike))
+ else if (sel_isEqual(op, EOQualifierOperatorLike))
qOperator = @"LIKE";
- else if (sel_eq(op, EOQualifierOperatorCaseInsensitiveLike)) {
+ else if (sel_isEqual(op, EOQualifierOperatorCaseInsensitiveLike)) {
isCI = YES;
qOperator = @"LIKE";
}
@@ -128,11 +124,11 @@
}
}
else {
- if (sel_eq(op, EOQualifierOperatorEqual)) {
+ if (sel_isEqual(op, EOQualifierOperatorEqual)) {
qOperator = @"IS";
qValue = @"NULL";
}
- else if (sel_eq(op, EOQualifierOperatorNotEqual)) {
+ else if (sel_isEqual(op, EOQualifierOperatorNotEqual)) {
qOperator = @"IS NOT";
qValue = @"NULL";
}
$OpenBSD$
--- SOPE/GDLContentStore/GCSFolder.m.orig Wed Feb 6 12:50:58 2013
+++ SOPE/GDLContentStore/GCSFolder.m Wed Feb 6 12:51:38 2013
@@ -44,10 +44,6 @@
#import "EOQualifier+GCS.h"
#import "GCSStringFormatter.h"
-#if __GNU_LIBOBJC__ >= 20100911
-# define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
-#endif
-
typedef enum {
noTableRequired = 0,
quickTableRequired = 1,
@@ -395,20 +391,20 @@ static GCSStringFormatter *stringFormatter = nil;
if (i > 0) [sql appendString:@", "];
- if (sel_eq(sel, EOCompareAscending)) {
+ if (sel_isEqual(sel, EOCompareAscending)) {
[sql appendString:column];
[sql appendString:@" ASC"];
}
- else if (sel_eq(sel, EOCompareDescending)) {
+ else if (sel_isEqual(sel, EOCompareDescending)) {
[sql appendString:column];
[sql appendString:@" DESC"];
}
- else if (sel_eq(sel, EOCompareCaseInsensitiveAscending)) {
+ else if (sel_isEqual(sel, EOCompareCaseInsensitiveAscending)) {
[sql appendString:@"UPPER("];
[sql appendString:column];
[sql appendString:@") ASC"];
}
- else if (sel_eq(sel, EOCompareCaseInsensitiveDescending)) {
+ else if (sel_isEqual(sel, EOCompareCaseInsensitiveDescending)) {
[sql appendString:@"UPPER("];
[sql appendString:column];
[sql appendString:@") DESC"];
|
|
|
|
same as with the similar report against SOPE, its not clang, but libobjc2 that causes the trouble. After update to 1.7, I get the same linking errors compiling with gcc. |
|
|
|
fix-unresolved-symbols.diff (2,109 bytes)
$OpenBSD$
--- UI/MailerUI/GNUmakefile.orig Sat Jun 29 15:59:59 2013
+++ UI/MailerUI/GNUmakefile Sat Jun 29 16:00:49 2013
@@ -32,6 +32,7 @@ MailerUI_OBJC_FILES += \
UIxMailWindowCloser.m \
\
UIxMailUserRightsEditor.m \
+ ../MailPartViewers/UIxMailRenderingContext.m \
UIxMailUserDelegationEditor.m \
# UIxMailEditorAction.m \
# UIxMailReplyAction.m \
$OpenBSD$
--- UI/MailPartViewers/GNUmakefile.preamble.orig Sat Jun 29 16:05:53 2013
+++ UI/MailPartViewers/GNUmakefile.preamble Sat Jun 29 16:06:10 2013
@@ -2,3 +2,10 @@ ifeq ($(HAS_LIBRARY_ssl),yes)
ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1
BUNDLE_LIBS += -lcrypto
endif
+
+ADDITIONAL_CPPFLAGS += \
+ -Wall -DCOMPILE_FOR_GSTEP_MAKE=1 \
+ -DUIX_MAILER_MAJOR_VERSION="@\"$(MAJOR_VERSION)\"" \
+ -DUIX_MAILER_MINOR_VERSION="@\"$(MINOR_VERSION)\"" \
+ -DUIX_MAILER_SUBMINOR_VERSION="@\"$(SUBMINOR_VERSION)\""
+
$OpenBSD$
--- UI/MailPartViewers/GNUmakefile.orig Thu Jun 27 17:50:25 2013
+++ UI/MailPartViewers/GNUmakefile Sat Jun 29 16:39:10 2013
@@ -26,6 +26,24 @@ MailPartViewers_OBJC_FILES += \
UIxMailPartICalViewer.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 \
|
|
|
|
this fix-unresolved-symbols.diff went to the wrong bug report, sorry |
|
|
|
So fix-unresolved-symbols.diff shouldn't be applied for this bug report, only sogo-fix-selectors.diff right? |
|
|
|
Yes, but meanwhile I recognized that with the patch applied, and the other patch to the similar bug against SOPE, I have trouble with SOGo starting up, giving weird errors when trying to log on :(
Either here, on in the patch against SOPE, I might have done something stupid, which makes the compiler happy, but not the program itself. |
|
|
|
https://github.com/inverse-inc/sogo/commit/048bae2fc510f0cdd39b07d23bb23cf492001921 |
|
|
|
This patch was seriously breaking SOGo on previous gcc/gnu objc runtime. |
|
|
|
fix-sogo-libobjc2.diff (1,032 bytes)
$OpenBSD: patch-SOPE_GDLContentStore_EOQualifier+GCS_m,v 1.1 2013/10/19 09:49:16 sebastia Exp $
--- SOPE/GDLContentStore/EOQualifier+GCS.m.orig Sun Oct 13 18:35:24 2013
+++ SOPE/GDLContentStore/EOQualifier+GCS.m Sun Oct 13 18:35:46 2013
@@ -27,7 +27,7 @@
#import "EOQualifier+GCS.h"
-#if __GNU_LIBOBJC__ >= 20100911
+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) || defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
# define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
#endif
$OpenBSD: patch-SOPE_GDLContentStore_GCSFolder_m,v 1.1 2013/10/19 09:49:16 sebastia Exp $
--- SOPE/GDLContentStore/GCSFolder.m.orig Sun Oct 13 18:35:05 2013
+++ SOPE/GDLContentStore/GCSFolder.m Sun Oct 13 18:35:16 2013
@@ -44,7 +44,7 @@
#import "EOQualifier+GCS.h"
#import "GCSStringFormatter.h"
-#if __GNU_LIBOBJC__ >= 20100911
+#if (defined(__GNU_LIBOBJC__) && (__GNU_LIBOBJC__ >= 20100911)) || defined(APPLE_RUNTIME) || defined(__GNUSTEP_RUNTIME__)
# define sel_eq(__A__,__B__) sel_isEqual(__A__,__B__)
#endif
|
|
|
|
the new patch fix-sogo-libobjc2.diff tested with libobjc2-1.6 on OpenBSD macppc and i386, and libobjc2-1.7 on amd64. |
|
|
|
Fix pushed: https://github.com/inverse-inc/sogo/commit/053b090affbd6a20f62e181d66058583926fca19 |
|
