From yavor at gnu.org  Thu Sep 18 19:32:12 2025
From: yavor at gnu.org (Yavor Doganov)
Date: Thu, 18 Sep 2025 21:32:12 +0300
Subject: [Pkg-sogo-maintainers] Bug#1115094: sbjson: please replace CDBS
 usage with dh_gnustep
In-Reply-To: <175776381870.59973.8101751855328996961.reportbug@quieter>
References: <175776381870.59973.8101751855328996961.reportbug@quieter>
 <175776381870.59973.8101751855328996961.reportbug@quieter>
Message-ID: <87tt0zmx1v.GNU's_not_UNIX!-yavor@gnu.org>

Control: tags -1 + patch

Please find attached a patch.
-------------- next part --------------
>From 616e8a7db00a284b67d3bd55db73e39117a3951e Mon Sep 17 00:00:00 2001
From: Yavor Doganov <yavor at gnu.org>
Date: Thu, 18 Sep 2025 21:24:28 +0300
Subject: [PATCH] Get rid of CDBS (#1115094).

---
 debian/changelog |  9 +++++++++
 debian/compat    |  1 -
 debian/control   |  3 +--
 debian/rules     | 15 ++++++++++-----
 4 files changed, 20 insertions(+), 8 deletions(-)
 delete mode 100644 debian/compat

diff --git a/debian/changelog b/debian/changelog
index 65bae5c..82c9349 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sbjson (2.3.2-6) UNRELEASED; urgency=medium
+
+  * debian/rules: Rewrite for dh.
+  * debian/control (Build-Depends): Remove cdbs (Closes: #1115094).
+    Switch to debhelper-compat; set level to 13.
+  * debian/compat: Delete.
+
+ -- Yavor Doganov <yavor at gnu.org>  Thu, 18 Sep 2025 21:21:51 +0300
+
 sbjson (2.3.2-5) unstable; urgency=medium
 
   [ Yavor Doganov ]
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 2c13188..03a9408 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,7 @@ Maintainer: Debian SOGo Maintainers <pkg-sogo-maintainers at lists.alioth.debian.or
 Uploaders: Jeroen Dekkers <jeroen at dekkers.ch>,
            Jordi Mallach <jordi at debian.org>
 Build-Depends: dpkg-dev (>= 1.22.5),
-               debhelper (>= 10),
-               cdbs,
+               debhelper-compat (= 13),
                libgnustep-base-dev (>= 1.30.0-10)
 Standards-Version: 4.7.0
 Homepage: https://github.com/SBJson/SBJson
diff --git a/debian/rules b/debian/rules
index 56fa351..2122d0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,9 +4,14 @@
 export DH_VERBOSE=1
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-include /usr/share/dpkg/buildflags.mk
-# FIXME: dpkg-buildflags / cdbs should support OBJCFLAGS
-DEB_MAKE_BUILD_TARGET = all messages=yes OBJCFLAGS="$(CFLAGS)"
+include /usr/share/GNUstep/debian/config.mk
 
-include /usr/share/cdbs/1/rules/gnustep.mk
-include /usr/share/cdbs/1/class/gnumakefile.mk
+%:
+	dh $@
+
+override_dh_auto_build:
+	dh_auto_build -- $(optim) $(verbose) \
+	  $(shell dpkg-buildflags --export=cmdline)
+
+execute_before_dh_link:
+	gsdh_gnustep
-- 
2.51.0


From owner at bugs.debian.org  Thu Sep 18 19:35:02 2025
From: owner at bugs.debian.org (Debian Bug Tracking System)
Date: Thu, 18 Sep 2025 18:35:02 +0000
Subject: [Pkg-sogo-maintainers] Processed: Re: Bug#1115094: sbjson: please
 replace CDBS usage with dh_gnustep
References: <87tt0zmx1v.GNU's_not_UNIX!-yavor@gnu.org>
 <175776381870.59973.8101751855328996961.reportbug@quieter>
Message-ID: <handler.s.B1115094.17582203482934482.transcript@bugs.debian.org>

Processing control commands:

> tags -1 + patch
Bug #1115094 [src:sbjson] sbjson: please replace CDBS usage with dh_gnustep
Added tag(s) patch.

-- 
1115094: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1115094
Debian Bug Tracking System
Contact owner at bugs.debian.org with problems


From yavor at gnu.org  Fri Sep 19 09:50:45 2025
From: yavor at gnu.org (Yavor Doganov)
Date: Fri, 19 Sep 2025 11:50:45 +0300
Subject: [Pkg-sogo-maintainers] Bug#1115709: sbjson: GNUstep patch can be
 grossly reduced
Message-ID: <87segin7ve.GNU's_not_UNIX!-yavor@gnu.org>

Source: sbjson
Version: 2.3.2-5
Severity: minor
Tags: patch

While working on the CDBS removal I noticed that
0002-remove-objc2.0-features.patch contains workarounds that are no
longer necessary:

  * GCC supports @property and @synthesize but requires ivars to be
    declared in the old fashioned way (which upstream code does).
  * GCC supports empty categories (apparently, I didn't know this).
  * GCC supports fast enumeration for Objective-C.
  * GNUstep CoreBase, the free replacement of CoreFoundation, is
    available in Debian since trixie.

So it turns out that most hunks can be safely removed.  I left out
only one as I suppose it is completely intentional --
+decimalNumberWithString: is certainly available but its behavior is
locale-specific.

The attached patch applies on top of the patch for #1115094 and I've
only build-tested it.
-------------- next part --------------
>From 59341fddec5debad23328f2f1319acc92fe673ce Mon Sep 17 00:00:00 2001
From: Yavor Doganov <yavor at gnu.org>
Date: Fri, 19 Sep 2025 11:35:00 +0300
Subject: [PATCH 2/2] Simplify GNUstep patch; build-depend on
 libgnustep-corebase-dev.

---
 debian/changelog                              |   7 +-
 debian/control                                |   2 +-
 debian/patches/0001-add-makefiles.patch       |   2 +-
 .../0002-remove-objc2.0-features.patch        | 286 +-----------------
 4 files changed, 11 insertions(+), 286 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 82c9349..4c67b8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,13 @@ sbjson (2.3.2-6) UNRELEASED; urgency=medium
 
   * debian/rules: Rewrite for dh.
   * debian/control (Build-Depends): Remove cdbs (Closes: #1115094).
-    Switch to debhelper-compat; set level to 13.
+    Switch to debhelper-compat; set level to 13.  Replace
+    libgnustep-base-dev with libgnustep-corebase-dev for
+    CFStringAppendCharacters and kCFNumberNaN.
   * debian/compat: Delete.
+  * debian/patches/0001-add-makefiles.patch: Link with gnustep-corebase.
+  * debian/patches/0002-remove-objc2.0-features.patch: Remove most hunks;
+    no longer necessary (Closes: #-1).
 
  -- Yavor Doganov <yavor at gnu.org>  Thu, 18 Sep 2025 21:21:51 +0300
 
diff --git a/debian/control b/debian/control
index 03a9408..84d2b75 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Jeroen Dekkers <jeroen at dekkers.ch>,
            Jordi Mallach <jordi at debian.org>
 Build-Depends: dpkg-dev (>= 1.22.5),
                debhelper-compat (= 13),
-               libgnustep-base-dev (>= 1.30.0-10)
+               libgnustep-corebase-dev
 Standards-Version: 4.7.0
 Homepage: https://github.com/SBJson/SBJson
 Vcs-Browser: https://salsa.debian.org/debian/sbjson
diff --git a/debian/patches/0001-add-makefiles.patch b/debian/patches/0001-add-makefiles.patch
index cbf7083..cd13616 100644
--- a/debian/patches/0001-add-makefiles.patch
+++ b/debian/patches/0001-add-makefiles.patch
@@ -39,7 +39,7 @@ index 0000000..625d963
 +        SBJsonParser.m \
 +        SBJsonWriter.m
 +
-+SBJson_LIBRARIES_DEPEND_UPON += -lgnustep-base -lobjc
++SBJson_LIBRARIES_DEPEND_UPON += -lgnustep-corebase $(FND_LIBS) $(OBJC_LIBS)
 +
 +-include GNUmakefile.preamble
 +include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/debian/patches/0002-remove-objc2.0-features.patch b/debian/patches/0002-remove-objc2.0-features.patch
index 7fdc9b3..f940bbd 100644
--- a/debian/patches/0002-remove-objc2.0-features.patch
+++ b/debian/patches/0002-remove-objc2.0-features.patch
@@ -10,114 +10,9 @@ Subject: remove-objc2.0-features
  Classes/SBJsonWriter.m |   68 +++++++++++++++++++++++++++++++++++++++++++----
  5 files changed, 109 insertions(+), 12 deletions(-)
 
-diff --git a/Classes/SBJsonBase.h b/Classes/SBJsonBase.h
-index 7b10844..ee72767 100644
---- a/Classes/SBJsonBase.h
-+++ b/Classes/SBJsonBase.h
-@@ -66,7 +66,7 @@ enum {
-  malicious and the parser returns nil, signalling an error. ("Nested too deep".) You can
-  turn off this security feature by setting the maxDepth value to 0.
-  */
-- at property NSUInteger maxDepth;
-+// @property NSUInteger maxDepth;
- 
- /**
-  @brief Return an error trace, or nil if there was no errors.
-@@ -75,7 +75,11 @@ enum {
-  You need to check the return value of the call you're making to figure out
-  if the call actually failed, before you know call this method.
-  */
-- @property(copy,readonly) NSArray* errorTrace;
-+#if GNUSTEP
-+- (NSArray *) errorTrace;
-+#else
-+ at property(copy,readonly) NSArray* errorTrace;
-+#endif
- 
- /// @internal for use in subclasses to add errors to the stack trace
- - (void)addErrorWithCode:(NSUInteger)code description:(NSString*)str;
-diff --git a/Classes/SBJsonBase.m b/Classes/SBJsonBase.m
-index 6684325..ef33ec3 100644
---- a/Classes/SBJsonBase.m
-+++ b/Classes/SBJsonBase.m
-@@ -33,13 +33,16 @@ NSString * SBJSONErrorDomain = @"org.brautaset.JSON.ErrorDomain";
- 
- @implementation SBJsonBase
- 
-+#if !GNUSTEP
- @synthesize errorTrace;
- @synthesize maxDepth;
-+#endif
- 
- - (id)init {
-     self = [super init];
-     if (self)
--        self.maxDepth = 512;
-+        maxDepth = 512;
-+
-     return self;
- }
- 
-@@ -48,6 +51,24 @@ NSString * SBJSONErrorDomain = @"org.brautaset.JSON.ErrorDomain";
-     [super dealloc];
- }
- 
-+#if GNUSTEP
-+- (NSArray *) errorTrace
-+{
-+  return errorTrace;
-+}
-+
-+- (void) setMaxDepth: (NSUInteger) newMaxDepth
-+{
-+  maxDepth = newMaxDepth;
-+}
-+
-+- (NSUInteger) maxDepth
-+{
-+  return maxDepth;
-+}
-+
-+#endif
-+
- - (void)addErrorWithCode:(NSUInteger)code description:(NSString*)str {
-     NSDictionary *userInfo;
-     if (!errorTrace) {
-diff --git a/Classes/SBJsonParser.m b/Classes/SBJsonParser.m
-index 222ef70..e87e096 100644
---- a/Classes/SBJsonParser.m
-+++ b/Classes/SBJsonParser.m
-@@ -29,7 +29,7 @@
- 
- #import "SBJsonParser.h"
- 
-- at interface SBJsonParser ()
-+ at interface SBJsonParser (SBJsonPrivate)
- 
- - (BOOL)scanValue:(NSObject **)o;
- 
-@@ -106,7 +106,7 @@ static char ctrl[0x22];
-         return tmp;
-     
-     if (error)
--        *error = [self.errorTrace lastObject];
-+        *error = [errorTrace lastObject];
-     return nil;
- }
- 
-@@ -342,7 +342,11 @@ static char ctrl[0x22];
-                     return NO;
-                     break;
-             }
-+#if GNUSTEP
-+            [*o appendFormat: @"%C", uc];
-+#else
-             CFStringAppendCharacters((CFMutableStringRef)*o, &uc, 1);
-+#endif
-             c++;
-             
-         } else if (*c < 0x20) {
-@@ -498,8 +502,10 @@ static char ctrl[0x22];
+--- sbjson.orig/Classes/SBJsonParser.m
++++ sbjson/Classes/SBJsonParser.m
+@@ -498,8 +498,10 @@
                                                encoding:NSUTF8StringEncoding
                                            freeWhenDone:NO];
          [str autorelease];
@@ -129,178 +24,3 @@ index 222ef70..e87e096 100644
          
          [self addErrorWithCode:EPARSENUM description: @"Failed creating decimal instance"];
          return NO;
-diff --git a/Classes/SBJsonWriter.h b/Classes/SBJsonWriter.h
-index ae1a597..7099c85 100644
---- a/Classes/SBJsonWriter.h
-+++ b/Classes/SBJsonWriter.h
-@@ -66,7 +66,12 @@
-  JSON with linebreaks after each array value and dictionary key/value pair, indented two
-  spaces per nesting level.
-  */
-+#if GNUSTEP
-+- (void) setHumanReadable: (BOOL) newValue;
-+- (BOOL) humanReadable;
-+#else
- @property BOOL humanReadable;
-+#endif
- 
- /**
-  @brief Whether or not to sort the dictionary keys in the output.
-@@ -74,7 +79,12 @@
-  If this is set to YES, the dictionary keys in the JSON output will be in sorted order.
-  (This is useful if you need to compare two structures, for example.) The default is NO.
-  */
-+#if GNUSTEP
-+- (void) setSortKeys: (BOOL) newValue;
-+- (BOOL) sortKeys;
-+#else
- @property BOOL sortKeys;
-+#endif
- 
- /**
-  @brief Return JSON representation (or fragment) for the given object.
-diff --git a/Classes/SBJsonWriter.m b/Classes/SBJsonWriter.m
-index 83e8a20..0bf6568 100644
---- a/Classes/SBJsonWriter.m
-+++ b/Classes/SBJsonWriter.m
-@@ -27,9 +27,11 @@
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
-+#include <math.h>
-+
- #import "SBJsonWriter.h"
- 
-- at interface SBJsonWriter ()
-+ at interface SBJsonWriter (SBJsonPrivate)
- 
- - (BOOL)appendValue:(id)fragment into:(NSMutableString*)json;
- - (BOOL)appendArray:(NSArray*)fragment into:(NSMutableString*)json;
-@@ -42,8 +44,10 @@
- 
- @implementation SBJsonWriter
- 
-+#if !GNUSTEP
- @synthesize sortKeys;
- @synthesize humanReadable;
-+#endif
- 
- static NSMutableCharacterSet *kEscapeChars;
- 
-@@ -52,6 +56,30 @@ static NSMutableCharacterSet *kEscapeChars;
- 	[kEscapeChars addCharactersInString: @"\"\\"];
- }
- 
-+#if GNUSTEP
-+- (void) setHumanReadable: (BOOL) newValue
-+{
-+  humanReadable = newValue;
-+}
-+
-+- (BOOL) humanReadable
-+{
-+  return humanReadable;
-+}
-+#endif
-+
-+#if GNUSTEP
-+- (void) setSortKeys: (BOOL) newValue
-+{
-+  sortKeys = newValue;
-+}
-+
-+- (BOOL) sortKeys
-+{
-+  return sortKeys;
-+}
-+#endif
-+
- - (NSString*)stringWithObject:(id)value {
-     [self clearErrorTrace];
-     
-@@ -78,7 +106,7 @@ static NSMutableCharacterSet *kEscapeChars;
-         return tmp;
-     
-     if (error)
--        *error = [self.errorTrace lastObject];
-+        *error = [errorTrace lastObject];
-     return nil;
- }
- 
-@@ -102,10 +130,11 @@ static NSMutableCharacterSet *kEscapeChars;
-     } else if ([fragment isKindOfClass:[NSNumber class]]) {
-         if ('c' == *[fragment objCType]) {
-             [json appendString:[fragment boolValue] ? @"true" : @"false"];
-+#if !GNUSTEP
-         } else if ([fragment isEqualToNumber:(NSNumber*)kCFNumberNaN]) {
-             [self addErrorWithCode:EUNSUPPORTED description:@"NaN is not a valid number in JSON"];
-             return NO;
--
-+#endif
-         } else if (isinf([fragment doubleValue])) {
-             [self addErrorWithCode:EUNSUPPORTED description:@"Infinity is not a valid number in JSON"];
-             return NO;
-@@ -126,14 +155,26 @@ static NSMutableCharacterSet *kEscapeChars;
- }
- 
- - (BOOL)appendArray:(NSArray*)fragment into:(NSMutableString*)json {
-+#if GNUSTEP
-+    NSEnumerator *fragmentEnum;
-+    id value;
-+
-+    fragmentEnum = [fragment objectEnumerator];
-+#endif
-+
-     if (maxDepth && ++depth > maxDepth) {
-         [self addErrorWithCode:EDEPTH description: @"Nested too deep"];
-         return NO;
-     }
-     [json appendString:@"["];
-     
--    BOOL addComma = NO;    
--    for (id value in fragment) {
-+    BOOL addComma = NO;
-+#if GNUSTEP
-+    while ((value = [fragmentEnum nextObject]))
-+#else
-+    for (id value in fragment)
-+#endif
-+      {
-         if (addComma)
-             [json appendString:@","];
-         else
-@@ -164,10 +205,21 @@ static NSMutableCharacterSet *kEscapeChars;
-     NSString *colon = [self humanReadable] ? @" : " : @":";
-     BOOL addComma = NO;
-     NSArray *keys = [fragment allKeys];
--    if (self.sortKeys)
-+#if GNUSTEP
-+    NSEnumerator *keysEnum;
-+    id value;
-+
-+    keysEnum = [keys objectEnumerator];
-+#endif
-+
-+    if (sortKeys)
-         keys = [keys sortedArrayUsingSelector:@selector(compare:)];
-     
-+#if GNUSTEP
-+    while ((value = [keysEnum nextObject])) {
-+#else
-     for (id value in keys) {
-+#endif
-         if (addComma)
-             [json appendString:@","];
-         else
-@@ -223,7 +275,11 @@ static NSMutableCharacterSet *kEscapeChars;
-                     if (uc < 0x20) {
-                         [json appendFormat:@"\\u%04x", uc];
-                     } else {
-+#if GNUSTEP
-+                        [json appendFormat: @"%C", uc];
-+#else
-                         CFStringAppendCharacters((CFMutableStringRef)json, &uc, 1);
-+#endif
-                     }
-                     break;
-                     
-- 
2.51.0