diff options
| -rw-r--r-- | Cydia.mm | 12 | ||||
| -rw-r--r-- | control | 2 | ||||
| -rw-r--r-- | makefile | 4 |
3 files changed, 10 insertions, 8 deletions
@@ -39,8 +39,8 @@ #define USE_SYSTEM_MALLOC 1 /* #include Directives {{{ */ -#import "UICaboodle.h" -#import "UCLocalize.h" +#import "UICaboodle/UCPlatform.h" +#import "UICaboodle/UCLocalize.h" #include <objc/message.h> #include <objc/objc.h> @@ -113,8 +113,8 @@ extern "C" { #include <ext/hash_map> -#import "BrowserView.h" -#import "ResetView.h" +#import "UICaboodle/BrowserView.h" +#import "UICaboodle/ResetView.h" #import "substrate.h" /* }}} */ @@ -3728,6 +3728,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (NSString *) localizedStringForKey:(NSString *)key value:(NSString *)value table:(NSString *)table { + if (reinterpret_cast<id>(value) == [WebUndefined undefined]) + value = nil; if (reinterpret_cast<id>(table) == [WebUndefined undefined]) table = nil; return [[NSBundle mainBundle] localizedStringForKey:key value:value table:table]; @@ -3769,7 +3771,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (id) initWithBook:(RVBook *)book forWidth:(float)width { - if ((self = [super initWithBook:book]) != nil) { + if ((self = [super initWithBook:book forWidth:width]) != nil) { cydia_ = [[CydiaObject alloc] initWithDelegate:indirect_]; WebView *webview([webview_ webView]); @@ -3,7 +3,7 @@ Priority: required Section: Packaging Maintainer: Jay Freeman (saurik) <saurik@saurik.com> Architecture: iphoneos-arm -Version: 1.0.2913-1 +Version: 1.0.2932-1 Replaces: com.sosiphone.addcydia Depends: apr-lib, apt7-lib, apt7-key, darwintools, pcre, shell-cmds, system-cmds Pre-Depends: dpkg (>= 1.14.25-8) @@ -9,8 +9,8 @@ all: Cydia clean: rm -f Cydia -Cydia: Cydia.mm ../uicaboodle.m/*.mm ../mobilesubstrate/*.h #makefile - $(target)g++ -march=armv6 -mcpu=arm1176jzf-s -mthumb -I../uicaboodle.m -I../mobilesubstrate -fobjc-call-cxx-cdtors -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework IOKit -framework CoreFoundation -framework Foundation -framework CoreGraphics -framework GraphicsServices -framework QuartzCore -framework JavaScriptCore -framework WebCore -framework WebKit -lobjc -lapt-pkg -lpcre -fobjc-exceptions -F"$${PKG_ROOT}"/System/Library/PrivateFrameworks -multiply_defined suppress -lapr-1 +Cydia: Cydia.mm UICaboodle/*.mm ../mobilesubstrate/*.h #makefile + $(target)g++ -march=armv6 -mcpu=arm1176jzf-s -mthumb -I. -I../mobilesubstrate -fobjc-call-cxx-cdtors -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework IOKit -framework CoreFoundation -framework Foundation -framework CoreGraphics -framework GraphicsServices -framework QuartzCore -framework JavaScriptCore -framework WebCore -framework WebKit -lobjc -lapt-pkg -lpcre -fobjc-exceptions -F"$${PKG_ROOT}"/System/Library/PrivateFrameworks -multiply_defined suppress -lapr-1 sign: Cydia CODESIGN_ALLOCATE=$$(which "$(target)codesign_allocate") ldid -Slaunch.xml Cydia |