From fe33a23ef38f596b2a71ccdf16876cf8d460a68a Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Mon, 6 Dec 2010 04:58:20 -0800 Subject: Cache section remap using APT cache pointer. --- MobileCydia.mm | 48 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/MobileCydia.mm b/MobileCydia.mm index 18fbe49..6e2b190 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -1355,6 +1355,8 @@ typedef std::map< unsigned long, _H > SourceMap; int cydiafd_; int statusfd_; FILE *input_; + + std::map > sections_; } + (Database *) sharedInstance; @@ -1388,6 +1390,9 @@ typedef std::map< unsigned long, _H > SourceMap; - (void) setDelegate:(id)delegate; - (Source *) getSource:(pkgCache::PkgFileIterator)file; + +- (NSString *) mappedSectionForPointer:(const char *)pointer; + @end /* }}} */ /* Delegate Helpers {{{ */ @@ -1844,7 +1849,7 @@ struct ParsedPackage { CYString latest_; CYString installed_; - CYString section_; + const char *section_; _transient NSString *section$_; Source *source_; @@ -2267,7 +2272,7 @@ struct PackageNameOrdering : _end _profile(Package$initWithVersion$Section) - section_.set(NULL, iterator.Section()); + section_ = iterator.Section(); _end _profile(Package$initWithVersion$Flags) @@ -2315,13 +2320,11 @@ struct PackageNameOrdering : - (NSString *) section { if (section$_ == nil) { - if (section_.empty()) + if (section_ == NULL) return nil; - _profile(Package$section) - std::replace(section_.data(), section_.data() + section_.size(), '_', ' '); - NSString *name(section_); - section$_ = [SectionMap_ objectForKey:name] ?: name; + _profile(Package$section$mappedSectionForPointer) + section$_ = [database_ mappedSectionForPointer:section_]; _end } return section$_; } @@ -2487,7 +2490,11 @@ struct PackageNameOrdering : if (![self unfiltered]) return false; - NSString *section([self section]); + NSString *section; + + _profile(Package$visible$section) + section = [self section]; + _end _profile(Package$visible$isSectionVisible) if (section != nil && !isSectionVisible(section)) @@ -3677,6 +3684,31 @@ static NSString *Warning_; return i == sources_.end() ? nil : i->second; } +- (NSString *) mappedSectionForPointer:(const char *)section { + _H &mapped(sections_[section]); + + if (mapped == NULL) { + size_t length(strlen(section)); + char spaced[length + 1]; + + _profile(Database$mappedSectionForPointer$Replace) + for (size_t index(0); index != length; ++index) + spaced[index] = section[index] == '_' ? ' ' : section[index]; + spaced[length] = '\0'; + _end + + NSString *string; + + _profile(Database$mappedSectionForPointer$stringWithUTF8String) + string = [NSString stringWithUTF8String:spaced]; + _end + + _profile(Database$mappedSectionForPointer$Map) + mapped = [SectionMap_ objectForKey:string] ?: string; + _end + } return mapped; +} + @end /* }}} */ -- cgit v1.2.3 From 97a3d89e8b16e6f50cf18fb3a84acae78e7ca720 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Mon, 6 Dec 2010 04:59:36 -0800 Subject: Store Package::role_ as integer instead of NSString. --- MobileCydia.mm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/MobileCydia.mm b/MobileCydia.mm index 6e2b190..97fa45c 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -1830,7 +1830,8 @@ struct ParsedPackage { }; @interface Package : NSObject { - uint32_t era_ : 29; + uint32_t era_ : 26; + uint32_t role_ : 3; uint32_t essential_ : 1; uint32_t obsolete_ : 1; uint32_t ignored_ : 1; @@ -1858,7 +1859,6 @@ struct ParsedPackage { ParsedPackage *parsed_; NSMutableArray *tags_; - NSString *role_; } - (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database; @@ -1920,7 +1920,6 @@ struct ParsedPackage { - (NSArray *) applications; - (Source *) source; -- (NSString *) role; - (BOOL) matches:(NSString *)text; @@ -2081,15 +2080,10 @@ struct PackageNameOrdering : - (void) dealloc { if (parsed_ != NULL) delete parsed_; - if (source_ != nil) [source_ release]; - if (tags_ != nil) [tags_ release]; - if (role_ != nil) - [role_ release]; - [super dealloc]; } @@ -2223,8 +2217,18 @@ struct PackageNameOrdering : const char *name(tag.Name()); [tags_ addObject:[(NSString *)CYStringCreate(name) autorelease]]; - if (role_ == nil && strncmp(name, "role::", 6) == 0 /*&& strcmp(name, "role::leaper") != 0*/) - role_ = (NSString *) CYStringCreate(name + 6); + if (role_ == 0 && strncmp(name, "role::", 6) == 0 /*&& strcmp(name, "role::leaper") != 0*/) { + if (strcmp(name + 6, "enduser") == 0) + role_ = 1; + else if (strcmp(name + 6, "hacker") == 0) + role_ = 2; + else if (strcmp(name + 6, "developer") == 0) + role_ = 3; + else if (strcmp(name + 6, "cydia") == 0) + role_ = 7; + else + role_ = 4; + } if (strncmp(name, "cydia::", 7) == 0) { if (strcmp(name + 7, "essential") == 0) @@ -2717,10 +2721,6 @@ struct PackageNameOrdering : return source_ == (Source *) [NSNull null] ? nil : source_; } -- (NSString *) role { - return role_; -} - - (BOOL) matches:(NSString *)text { if (text == nil) return NO; @@ -2743,17 +2743,17 @@ struct PackageNameOrdering : } - (bool) hasSupportingRole { - if (role_ == nil) + if (role_ == 0) return true; - if ([role_ isEqualToString:@"enduser"]) + if (role_ == 1) return true; if ([Role_ isEqualToString:@"User"]) return false; - if ([role_ isEqualToString:@"hacker"]) + if (role_ == 2) return true; if ([Role_ isEqualToString:@"Hacker"]) return false; - if ([role_ isEqualToString:@"developer"]) + if (role_ == 3) return true; if ([Role_ isEqualToString:@"Developer"]) return false; @@ -2875,7 +2875,7 @@ struct PackageNameOrdering : } - (bool) isInstalledAndUnfiltered:(NSNumber *)number { - return ![self uninstalled] && (![number boolValue] && ![role_ isEqualToString:@"cydia"] || [self unfiltered]); + return ![self uninstalled] && (![number boolValue] && role_ != 7 || [self unfiltered]); } - (bool) isVisibleInSection:(NSString *)name { -- cgit v1.2.3 From 75b9525607c341f52e51ff855dbc5799f47b0499 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 7 Dec 2010 02:15:37 -0800 Subject: Fix 'resubmit form' dialog: new alert API crash. --- UICaboodle/BrowserView.mm | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/UICaboodle/BrowserView.mm b/UICaboodle/BrowserView.mm index 168cff1..1017496 100644 --- a/UICaboodle/BrowserView.mm +++ b/UICaboodle/BrowserView.mm @@ -837,19 +837,13 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se [alert dismissWithClickedButtonIndex:-1 animated:YES]; } else if ([context isEqualToString:@"submit"]) { - switch (button) { - case 1: - break; - - case 2: - if (request_ != nil) { - WebThreadLock(); - [webview_ loadRequest:request_]; - WebThreadUnlock(); - } - break; - - _nodefault + if (button == [alert cancelButtonIndex]) { + } else if (button == [alert firstOtherButtonIndex]) { + if (request_ != nil) { + WebThreadLock(); + [webview_ loadRequest:request_]; + WebThreadUnlock(); + } } [alert dismissWithClickedButtonIndex:-1 animated:YES]; -- cgit v1.2.3 From 8cfba08862aa81912f30886736d16bf3cc5d89a2 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 7 Dec 2010 02:16:40 -0800 Subject: Do not highlight section cell text while editing. --- MobileCydia.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MobileCydia.mm b/MobileCydia.mm index 97fa45c..2756250 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -5176,7 +5176,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) drawContentRect:(CGRect)rect { - bool highlighted(highlighted_); + bool highlighted(highlighted_ && !editing_); [icon_ drawInRect:CGRectMake(8, 7, 32, 32)]; -- cgit v1.2.3 From cf48f65699b65f3aefb5b76bb36a9dbc76fdd6f6 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 7 Dec 2010 02:18:46 -0800 Subject: Add _unlikely() to conditions in -[Package unfiltered]. --- MobileCydia.mm | 4 ++-- UICaboodle/UCPlatform.h | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/MobileCydia.mm b/MobileCydia.mm index 2756250..5f9e1d8 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -2478,12 +2478,12 @@ struct PackageNameOrdering : - (BOOL) unfiltered { _profile(Package$unfiltered$obsolete) - if (obsolete_) + if (_unlikely(obsolete_)) return false; _end _profile(Package$unfiltered$hasSupportingRole) - if (![self hasSupportingRole]) + if (_unlikely(![self hasSupportingRole])) return false; _end diff --git a/UICaboodle/UCPlatform.h b/UICaboodle/UCPlatform.h index 4f2169e..c241232 100644 --- a/UICaboodle/UCPlatform.h +++ b/UICaboodle/UCPlatform.h @@ -54,3 +54,9 @@ while (false) default: \ _assume(false); \ throw; + +#define _likely(expr) \ + __builtin_expect(expr, 1) + +#define _unlikely(expr) \ + __builtin_expect(expr, 0) -- cgit v1.2.3 From 4905df000ad745fa65c734ea7aa4cbd53e34b595 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 7 Dec 2010 02:20:00 -0800 Subject: Allow profiling usage of Database::sections_ in -[Database mappedSectionForPointer:]. --- MobileCydia.mm | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/MobileCydia.mm b/MobileCydia.mm index 5f9e1d8..b7050fc 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -3685,9 +3685,13 @@ static NSString *Warning_; } - (NSString *) mappedSectionForPointer:(const char *)section { - _H &mapped(sections_[section]); + _H *mapped; - if (mapped == NULL) { + _profile(Database$mappedSectionForPointer$Cache) + mapped = §ions_[section]; + _end + + if (*mapped == NULL) { size_t length(strlen(section)); char spaced[length + 1]; @@ -3704,9 +3708,11 @@ static NSString *Warning_; _end _profile(Database$mappedSectionForPointer$Map) - mapped = [SectionMap_ objectForKey:string] ?: string; + string = [SectionMap_ objectForKey:string] ?: string; _end - } return mapped; + + *mapped = string; + } return *mapped; } @end -- cgit v1.2.3 From d3aa466c92e3677aca0d4e7adff3bdcba1a00030 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 7 Dec 2010 02:23:24 -0800 Subject: Reallocate ChangesController::packages_ in _reloadPackages: instead of clearing in reloadData. --- MobileCydia.mm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MobileCydia.mm b/MobileCydia.mm index b7050fc..ec4ba25 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -7542,6 +7542,9 @@ freeing the view controllers on tab change */ } - (void) _reloadPackages:(NSArray *)packages { + CFRelease(packages_); + packages_ = CFArrayCreateMutable(kCFAllocatorDefault, [packages count], NULL); + _trace(); for (Package *package in packages) if ([package upgradableAndEssential:YES] || [package visible]) @@ -7556,8 +7559,6 @@ freeing the view controllers on tab change */ era_ = [database_ era]; NSArray *packages = [database_ packages]; - CFArrayRemoveAllValues(packages_); - [sections_ removeAllObjects]; #if 1 -- cgit v1.2.3 From 3121443aa805f1f89fc6b81b4957fe4d0aedd692 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 7 Dec 2010 02:23:33 -0800 Subject: Add database lock @synchronized to -[ChangesController reloadData]. --- MobileCydia.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MobileCydia.mm b/MobileCydia.mm index ec4ba25..74ec4d2 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -7556,6 +7556,7 @@ freeing the view controllers on tab change */ } - (void) reloadData { +@synchronized (database_) { era_ = [database_ era]; NSArray *packages = [database_ packages]; @@ -7648,7 +7649,7 @@ freeing the view controllers on tab change */ target:self action:@selector(refreshButtonClicked) ] autorelease]]; -} +} } @end /* }}} */ -- cgit v1.2.3 From 9bb3b29517f87de33c5e2e47b2a75da4417284a3 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 7 Dec 2010 02:24:18 -0800 Subject: Further break down _profile usage for ChangesController. --- MobileCydia.mm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/MobileCydia.mm b/MobileCydia.mm index 74ec4d2..9824346 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -7546,12 +7546,15 @@ freeing the view controllers on tab change */ packages_ = CFArrayCreateMutable(kCFAllocatorDefault, [packages count], NULL); _trace(); - for (Package *package in packages) - if ([package upgradableAndEssential:YES] || [package visible]) - CFArrayAppendValue(packages_, package); - + _profile(ChangesController$_reloadPackages$Filter) + for (Package *package in packages) + if ([package upgradableAndEssential:YES] || [package visible]) + CFArrayAppendValue(packages_, package); + _end _trace(); - [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast(&PackageChangesRadix) withContext:NULL]; + _profile(ChangesController$_reloadPackages$radixSort) + [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast(&PackageChangesRadix) withContext:NULL]; + _end _trace(); } @@ -7649,6 +7652,8 @@ freeing the view controllers on tab change */ target:self action:@selector(refreshButtonClicked) ] autorelease]]; + + PrintTimes(); } } @end -- cgit v1.2.3 From c1d8d92111342b3729c40e712a0f189dc0ee90a9 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 7 Dec 2010 03:01:16 -0800 Subject: Revert all PNG files to their pre-pngcrush state. --- MobileCydia.app/Default-Landscape.png | Bin 7584 -> 9372 bytes MobileCydia.app/Default-Portrait.png | Bin 7861 -> 9888 bytes MobileCydia.app/Icon-Small-50.png | Bin 6067 -> 6204 bytes MobileCydia.app/Icon-Small.png | Bin 2510 -> 2509 bytes MobileCydia.app/Icon-Small@2x.png | Bin 8193 -> 8377 bytes MobileCydia.app/Modes/DOWNGRADE.png | Bin 1187 -> 1176 bytes MobileCydia.app/Modes/INSTALL.png | Bin 1457 -> 2135 bytes MobileCydia.app/Modes/PURGE.png | Bin 2357 -> 2443 bytes MobileCydia.app/Modes/REINSTALL.png | Bin 1935 -> 2013 bytes MobileCydia.app/Modes/REMOVE.png | Bin 2388 -> 2552 bytes MobileCydia.app/Modes/UPGRADE.png | Bin 1188 -> 1635 bytes MobileCydia.app/Purposes/commercial.png | Bin 2317 -> 2379 bytes MobileCydia.app/Purposes/console.png | Bin 1131 -> 1225 bytes MobileCydia.app/Purposes/daemon.png | Bin 1933 -> 2133 bytes MobileCydia.app/Purposes/extension.png | Bin 1425 -> 1596 bytes MobileCydia.app/Purposes/library.png | Bin 1742 -> 2277 bytes MobileCydia.app/Purposes/uikit.png | Bin 2174 -> 2214 bytes MobileCydia.app/Purposes/x.png | Bin 1629 -> 1846 bytes MobileCydia.app/Sections/Addons.png | Bin 3248 -> 3609 bytes MobileCydia.app/Sections/Administration.png | Bin 2847 -> 5763 bytes MobileCydia.app/Sections/Archiving.png | Bin 5344 -> 6180 bytes MobileCydia.app/Sections/Blanks.png | Bin 801 -> 897 bytes MobileCydia.app/Sections/Books.png | Bin 4588 -> 7396 bytes MobileCydia.app/Sections/Carrier Bundles.png | Bin 6526 -> 7695 bytes MobileCydia.app/Sections/Communication.png | Bin 6526 -> 7695 bytes MobileCydia.app/Sections/Data Storage.png | Bin 7102 -> 7852 bytes MobileCydia.app/Sections/Development.png | Bin 6163 -> 6741 bytes MobileCydia.app/Sections/Dictionaries.png | Bin 6183 -> 6426 bytes MobileCydia.app/Sections/Education.png | Bin 4488 -> 5020 bytes MobileCydia.app/Sections/Entertainment.png | Bin 3012 -> 3703 bytes MobileCydia.app/Sections/Fonts.png | Bin 2759 -> 2896 bytes MobileCydia.app/Sections/Games.png | Bin 4916 -> 5075 bytes MobileCydia.app/Sections/Health and Fitness.png | Bin 4360 -> 5319 bytes MobileCydia.app/Sections/Imaging.png | Bin 6620 -> 6767 bytes MobileCydia.app/Sections/Java.png | Bin 6303 -> 6815 bytes MobileCydia.app/Sections/Keyboards.png | Bin 5767 -> 6726 bytes MobileCydia.app/Sections/Localization.png | Bin 7062 -> 7267 bytes MobileCydia.app/Sections/Messaging.png | Bin 4786 -> 5171 bytes MobileCydia.app/Sections/Multimedia.png | Bin 9128 -> 12530 bytes MobileCydia.app/Sections/Navigation.png | Bin 6469 -> 7187 bytes MobileCydia.app/Sections/Networking.png | Bin 8005 -> 8234 bytes MobileCydia.app/Sections/Packaging.png | Bin 3537 -> 3694 bytes MobileCydia.app/Sections/Productivity.png | Bin 6518 -> 7831 bytes MobileCydia.app/Sections/Repositories.png | Bin 6975 -> 7612 bytes MobileCydia.app/Sections/Ringtones.png | Bin 3829 -> 7259 bytes MobileCydia.app/Sections/Scripting.png | Bin 4322 -> 7107 bytes MobileCydia.app/Sections/Security.png | Bin 5704 -> 8703 bytes MobileCydia.app/Sections/Site-Specific Apps.png | Bin 6967 -> 8042 bytes MobileCydia.app/Sections/Social.png | Bin 6065 -> 6272 bytes MobileCydia.app/Sections/Soundboards.png | Bin 4331 -> 7408 bytes MobileCydia.app/Sections/System.png | Bin 4489 -> 4556 bytes MobileCydia.app/Sections/Terminal Support.png | Bin 3597 -> 3950 bytes MobileCydia.app/Sections/Text Editors.png | Bin 4248 -> 4405 bytes MobileCydia.app/Sections/Themes.png | Bin 5648 -> 5790 bytes MobileCydia.app/Sections/Toys.png | Bin 7221 -> 7265 bytes MobileCydia.app/Sections/Tweaks.png | Bin 4199 -> 7359 bytes MobileCydia.app/Sections/Utilities.png | Bin 6096 -> 6341 bytes MobileCydia.app/Sections/Wallpaper.png | Bin 6795 -> 9584 bytes MobileCydia.app/Sections/WebClips.png | Bin 4052 -> 6877 bytes MobileCydia.app/Sections/Widgets.png | Bin 7000 -> 9943 bytes MobileCydia.app/Sections/X Window.png | Bin 4487 -> 4788 bytes MobileCydia.app/changes@2x.png | Bin 2349 -> 3150 bytes MobileCydia.app/chevron@2x.png | Bin 170 -> 415 bytes MobileCydia.app/commercial.png | Bin 7224 -> 7550 bytes MobileCydia.app/console.png | Bin 2584 -> 2812 bytes MobileCydia.app/email.png | Bin 22680 -> 22892 bytes MobileCydia.app/expanded.png | Bin 5344 -> 6180 bytes MobileCydia.app/filesystem.png | Bin 7102 -> 7852 bytes MobileCydia.app/home-Selected@2x.png | Bin 5616 -> 6563 bytes MobileCydia.app/home@2x.png | Bin 4239 -> 5127 bytes MobileCydia.app/icon-72.png | Bin 12382 -> 12858 bytes MobileCydia.app/icon.png | Bin 8366 -> 8597 bytes MobileCydia.app/icon@2x.png | Bin 27325 -> 29127 bytes MobileCydia.app/iconClassic.png | Bin 5443 -> 11737 bytes MobileCydia.app/id.png | Bin 3231 -> 3706 bytes MobileCydia.app/install@2x.png | Bin 462 -> 696 bytes MobileCydia.app/installed.png | Bin 516 -> 612 bytes MobileCydia.app/installed@2x.png | Bin 1372 -> 1518 bytes MobileCydia.app/installing.png | Bin 701 -> 733 bytes MobileCydia.app/manage@2x.png | Bin 1535 -> 2080 bytes MobileCydia.app/menes/chevron.png | Bin 179 -> 289 bytes MobileCydia.app/menes/chevron@2x.png | Bin 170 -> 415 bytes MobileCydia.app/packages.png | Bin 8430 -> 8884 bytes MobileCydia.app/removing.png | Bin 680 -> 1166 bytes MobileCydia.app/search@2x.png | Bin 703 -> 1143 bytes MobileCydia.app/settings.png | Bin 4658 -> 5848 bytes MobileCydia.app/source.png | Bin 1171 -> 2295 bytes MobileCydia.app/source@2x.png | Bin 2057 -> 3595 bytes MobileCydia.app/sources.png | Bin 20529 -> 22251 bytes MobileCydia.app/star.png | Bin 1795 -> 1757 bytes MobileCydia.app/storage.png | Bin 10418 -> 14343 bytes MobileCydia.app/trusted.png | Bin 21030 -> 22915 bytes MobileCydia.app/unknown.png | Bin 1489 -> 1794 bytes MobileCydia.app/version.png | Bin 694 -> 891 bytes MobileCydia.app/warning.png | Bin 4402 -> 5000 bytes MobileCydia.app/web.png | Bin 8005 -> 8234 bytes 96 files changed, 0 insertions(+), 0 deletions(-) diff --git a/MobileCydia.app/Default-Landscape.png b/MobileCydia.app/Default-Landscape.png index 8788186..a3f4343 100644 Binary files a/MobileCydia.app/Default-Landscape.png and b/MobileCydia.app/Default-Landscape.png differ diff --git a/MobileCydia.app/Default-Portrait.png b/MobileCydia.app/Default-Portrait.png index 83a73af..240b409 100644 Binary files a/MobileCydia.app/Default-Portrait.png and b/MobileCydia.app/Default-Portrait.png differ diff --git a/MobileCydia.app/Icon-Small-50.png b/MobileCydia.app/Icon-Small-50.png index d27a6f7..d7d2849 100644 Binary files a/MobileCydia.app/Icon-Small-50.png and b/MobileCydia.app/Icon-Small-50.png differ diff --git a/MobileCydia.app/Icon-Small.png b/MobileCydia.app/Icon-Small.png index c7f6176..af15d71 100644 Binary files a/MobileCydia.app/Icon-Small.png and b/MobileCydia.app/Icon-Small.png differ diff --git a/MobileCydia.app/Icon-Small@2x.png b/MobileCydia.app/Icon-Small@2x.png index a741dda..1a73ddb 100644 Binary files a/MobileCydia.app/Icon-Small@2x.png and b/MobileCydia.app/Icon-Small@2x.png differ diff --git a/MobileCydia.app/Modes/DOWNGRADE.png b/MobileCydia.app/Modes/DOWNGRADE.png index 3c5576f..41c0d70 100644 Binary files a/MobileCydia.app/Modes/DOWNGRADE.png and b/MobileCydia.app/Modes/DOWNGRADE.png differ diff --git a/MobileCydia.app/Modes/INSTALL.png b/MobileCydia.app/Modes/INSTALL.png index 55c5f18..a83f354 100644 Binary files a/MobileCydia.app/Modes/INSTALL.png and b/MobileCydia.app/Modes/INSTALL.png differ diff --git a/MobileCydia.app/Modes/PURGE.png b/MobileCydia.app/Modes/PURGE.png index 3311df5..795fa19 100644 Binary files a/MobileCydia.app/Modes/PURGE.png and b/MobileCydia.app/Modes/PURGE.png differ diff --git a/MobileCydia.app/Modes/REINSTALL.png b/MobileCydia.app/Modes/REINSTALL.png index a200373..0b7754c 100644 Binary files a/MobileCydia.app/Modes/REINSTALL.png and b/MobileCydia.app/Modes/REINSTALL.png differ diff --git a/MobileCydia.app/Modes/REMOVE.png b/MobileCydia.app/Modes/REMOVE.png index 7408a16..1b2e691 100644 Binary files a/MobileCydia.app/Modes/REMOVE.png and b/MobileCydia.app/Modes/REMOVE.png differ diff --git a/MobileCydia.app/Modes/UPGRADE.png b/MobileCydia.app/Modes/UPGRADE.png index e74636e..631b7ef 100644 Binary files a/MobileCydia.app/Modes/UPGRADE.png and b/MobileCydia.app/Modes/UPGRADE.png differ diff --git a/MobileCydia.app/Purposes/commercial.png b/MobileCydia.app/Purposes/commercial.png index 5139ec4..9c411cc 100644 Binary files a/MobileCydia.app/Purposes/commercial.png and b/MobileCydia.app/Purposes/commercial.png differ diff --git a/MobileCydia.app/Purposes/console.png b/MobileCydia.app/Purposes/console.png index 32afcb5..08d1869 100644 Binary files a/MobileCydia.app/Purposes/console.png and b/MobileCydia.app/Purposes/console.png differ diff --git a/MobileCydia.app/Purposes/daemon.png b/MobileCydia.app/Purposes/daemon.png index f332f5d..896c9be 100644 Binary files a/MobileCydia.app/Purposes/daemon.png and b/MobileCydia.app/Purposes/daemon.png differ diff --git a/MobileCydia.app/Purposes/extension.png b/MobileCydia.app/Purposes/extension.png index a9cefa1..59e051b 100644 Binary files a/MobileCydia.app/Purposes/extension.png and b/MobileCydia.app/Purposes/extension.png differ diff --git a/MobileCydia.app/Purposes/library.png b/MobileCydia.app/Purposes/library.png index eca2032..e275e06 100644 Binary files a/MobileCydia.app/Purposes/library.png and b/MobileCydia.app/Purposes/library.png differ diff --git a/MobileCydia.app/Purposes/uikit.png b/MobileCydia.app/Purposes/uikit.png index 03791b1..694107f 100644 Binary files a/MobileCydia.app/Purposes/uikit.png and b/MobileCydia.app/Purposes/uikit.png differ diff --git a/MobileCydia.app/Purposes/x.png b/MobileCydia.app/Purposes/x.png index 48f57d3..2feac90 100644 Binary files a/MobileCydia.app/Purposes/x.png and b/MobileCydia.app/Purposes/x.png differ diff --git a/MobileCydia.app/Sections/Addons.png b/MobileCydia.app/Sections/Addons.png index 74c9c35..424f565 100644 Binary files a/MobileCydia.app/Sections/Addons.png and b/MobileCydia.app/Sections/Addons.png differ diff --git a/MobileCydia.app/Sections/Administration.png b/MobileCydia.app/Sections/Administration.png index 0d595d8..65efd3e 100644 Binary files a/MobileCydia.app/Sections/Administration.png and b/MobileCydia.app/Sections/Administration.png differ diff --git a/MobileCydia.app/Sections/Archiving.png b/MobileCydia.app/Sections/Archiving.png index 4fa3711..9efce56 100644 Binary files a/MobileCydia.app/Sections/Archiving.png and b/MobileCydia.app/Sections/Archiving.png differ diff --git a/MobileCydia.app/Sections/Blanks.png b/MobileCydia.app/Sections/Blanks.png index bacf1a1..7c0c2a0 100644 Binary files a/MobileCydia.app/Sections/Blanks.png and b/MobileCydia.app/Sections/Blanks.png differ diff --git a/MobileCydia.app/Sections/Books.png b/MobileCydia.app/Sections/Books.png index 509eac5..512c68b 100644 Binary files a/MobileCydia.app/Sections/Books.png and b/MobileCydia.app/Sections/Books.png differ diff --git a/MobileCydia.app/Sections/Carrier Bundles.png b/MobileCydia.app/Sections/Carrier Bundles.png index df25b3c..00f36f7 100644 Binary files a/MobileCydia.app/Sections/Carrier Bundles.png and b/MobileCydia.app/Sections/Carrier Bundles.png differ diff --git a/MobileCydia.app/Sections/Communication.png b/MobileCydia.app/Sections/Communication.png index df25b3c..00f36f7 100644 Binary files a/MobileCydia.app/Sections/Communication.png and b/MobileCydia.app/Sections/Communication.png differ diff --git a/MobileCydia.app/Sections/Data Storage.png b/MobileCydia.app/Sections/Data Storage.png index 5097038..1bb23fe 100644 Binary files a/MobileCydia.app/Sections/Data Storage.png and b/MobileCydia.app/Sections/Data Storage.png differ diff --git a/MobileCydia.app/Sections/Development.png b/MobileCydia.app/Sections/Development.png index 57cffe6..806b442 100644 Binary files a/MobileCydia.app/Sections/Development.png and b/MobileCydia.app/Sections/Development.png differ diff --git a/MobileCydia.app/Sections/Dictionaries.png b/MobileCydia.app/Sections/Dictionaries.png index a5a85b5..e386e76 100644 Binary files a/MobileCydia.app/Sections/Dictionaries.png and b/MobileCydia.app/Sections/Dictionaries.png differ diff --git a/MobileCydia.app/Sections/Education.png b/MobileCydia.app/Sections/Education.png index 549bf52..4a2a03f 100644 Binary files a/MobileCydia.app/Sections/Education.png and b/MobileCydia.app/Sections/Education.png differ diff --git a/MobileCydia.app/Sections/Entertainment.png b/MobileCydia.app/Sections/Entertainment.png index 53d32aa..69c8214 100644 Binary files a/MobileCydia.app/Sections/Entertainment.png and b/MobileCydia.app/Sections/Entertainment.png differ diff --git a/MobileCydia.app/Sections/Fonts.png b/MobileCydia.app/Sections/Fonts.png index 688929a..6fdab33 100644 Binary files a/MobileCydia.app/Sections/Fonts.png and b/MobileCydia.app/Sections/Fonts.png differ diff --git a/MobileCydia.app/Sections/Games.png b/MobileCydia.app/Sections/Games.png index 0f81c11..6e14c50 100644 Binary files a/MobileCydia.app/Sections/Games.png and b/MobileCydia.app/Sections/Games.png differ diff --git a/MobileCydia.app/Sections/Health and Fitness.png b/MobileCydia.app/Sections/Health and Fitness.png index d44ffb3..e2db013 100644 Binary files a/MobileCydia.app/Sections/Health and Fitness.png and b/MobileCydia.app/Sections/Health and Fitness.png differ diff --git a/MobileCydia.app/Sections/Imaging.png b/MobileCydia.app/Sections/Imaging.png index bbaad32..1e8f7fa 100644 Binary files a/MobileCydia.app/Sections/Imaging.png and b/MobileCydia.app/Sections/Imaging.png differ diff --git a/MobileCydia.app/Sections/Java.png b/MobileCydia.app/Sections/Java.png index e72e139..e6bbc91 100644 Binary files a/MobileCydia.app/Sections/Java.png and b/MobileCydia.app/Sections/Java.png differ diff --git a/MobileCydia.app/Sections/Keyboards.png b/MobileCydia.app/Sections/Keyboards.png index 8d74898..6b3df89 100644 Binary files a/MobileCydia.app/Sections/Keyboards.png and b/MobileCydia.app/Sections/Keyboards.png differ diff --git a/MobileCydia.app/Sections/Localization.png b/MobileCydia.app/Sections/Localization.png index 5cb61dc..80d41d3 100644 Binary files a/MobileCydia.app/Sections/Localization.png and b/MobileCydia.app/Sections/Localization.png differ diff --git a/MobileCydia.app/Sections/Messaging.png b/MobileCydia.app/Sections/Messaging.png index b3722a1..69d18e0 100644 Binary files a/MobileCydia.app/Sections/Messaging.png and b/MobileCydia.app/Sections/Messaging.png differ diff --git a/MobileCydia.app/Sections/Multimedia.png b/MobileCydia.app/Sections/Multimedia.png index 28caa85..42d0b5e 100644 Binary files a/MobileCydia.app/Sections/Multimedia.png and b/MobileCydia.app/Sections/Multimedia.png differ diff --git a/MobileCydia.app/Sections/Navigation.png b/MobileCydia.app/Sections/Navigation.png index 0116be7..4829e62 100644 Binary files a/MobileCydia.app/Sections/Navigation.png and b/MobileCydia.app/Sections/Navigation.png differ diff --git a/MobileCydia.app/Sections/Networking.png b/MobileCydia.app/Sections/Networking.png index 35ca612..a4f04e3 100644 Binary files a/MobileCydia.app/Sections/Networking.png and b/MobileCydia.app/Sections/Networking.png differ diff --git a/MobileCydia.app/Sections/Packaging.png b/MobileCydia.app/Sections/Packaging.png index 6e798ca..d7d914e 100644 Binary files a/MobileCydia.app/Sections/Packaging.png and b/MobileCydia.app/Sections/Packaging.png differ diff --git a/MobileCydia.app/Sections/Productivity.png b/MobileCydia.app/Sections/Productivity.png index 3508670..c99c69d 100644 Binary files a/MobileCydia.app/Sections/Productivity.png and b/MobileCydia.app/Sections/Productivity.png differ diff --git a/MobileCydia.app/Sections/Repositories.png b/MobileCydia.app/Sections/Repositories.png index 0fdaaff..d6fe267 100644 Binary files a/MobileCydia.app/Sections/Repositories.png and b/MobileCydia.app/Sections/Repositories.png differ diff --git a/MobileCydia.app/Sections/Ringtones.png b/MobileCydia.app/Sections/Ringtones.png index 4f4da74..57fd660 100644 Binary files a/MobileCydia.app/Sections/Ringtones.png and b/MobileCydia.app/Sections/Ringtones.png differ diff --git a/MobileCydia.app/Sections/Scripting.png b/MobileCydia.app/Sections/Scripting.png index 2cac5c6..22285d2 100644 Binary files a/MobileCydia.app/Sections/Scripting.png and b/MobileCydia.app/Sections/Scripting.png differ diff --git a/MobileCydia.app/Sections/Security.png b/MobileCydia.app/Sections/Security.png index dce315d..ae142eb 100644 Binary files a/MobileCydia.app/Sections/Security.png and b/MobileCydia.app/Sections/Security.png differ diff --git a/MobileCydia.app/Sections/Site-Specific Apps.png b/MobileCydia.app/Sections/Site-Specific Apps.png index 969036c..6732d7b 100644 Binary files a/MobileCydia.app/Sections/Site-Specific Apps.png and b/MobileCydia.app/Sections/Site-Specific Apps.png differ diff --git a/MobileCydia.app/Sections/Social.png b/MobileCydia.app/Sections/Social.png index 79d6e55..6c0cfa4 100644 Binary files a/MobileCydia.app/Sections/Social.png and b/MobileCydia.app/Sections/Social.png differ diff --git a/MobileCydia.app/Sections/Soundboards.png b/MobileCydia.app/Sections/Soundboards.png index c91f9af..accfcad 100644 Binary files a/MobileCydia.app/Sections/Soundboards.png and b/MobileCydia.app/Sections/Soundboards.png differ diff --git a/MobileCydia.app/Sections/System.png b/MobileCydia.app/Sections/System.png index 3a70055..19d2c22 100644 Binary files a/MobileCydia.app/Sections/System.png and b/MobileCydia.app/Sections/System.png differ diff --git a/MobileCydia.app/Sections/Terminal Support.png b/MobileCydia.app/Sections/Terminal Support.png index 3ab1103..d664618 100644 Binary files a/MobileCydia.app/Sections/Terminal Support.png and b/MobileCydia.app/Sections/Terminal Support.png differ diff --git a/MobileCydia.app/Sections/Text Editors.png b/MobileCydia.app/Sections/Text Editors.png index 5b4129a..5e65d46 100644 Binary files a/MobileCydia.app/Sections/Text Editors.png and b/MobileCydia.app/Sections/Text Editors.png differ diff --git a/MobileCydia.app/Sections/Themes.png b/MobileCydia.app/Sections/Themes.png index 943ef49..e35b948 100644 Binary files a/MobileCydia.app/Sections/Themes.png and b/MobileCydia.app/Sections/Themes.png differ diff --git a/MobileCydia.app/Sections/Toys.png b/MobileCydia.app/Sections/Toys.png index fc56838..368eb4c 100644 Binary files a/MobileCydia.app/Sections/Toys.png and b/MobileCydia.app/Sections/Toys.png differ diff --git a/MobileCydia.app/Sections/Tweaks.png b/MobileCydia.app/Sections/Tweaks.png index 70a30f8..4f588c6 100644 Binary files a/MobileCydia.app/Sections/Tweaks.png and b/MobileCydia.app/Sections/Tweaks.png differ diff --git a/MobileCydia.app/Sections/Utilities.png b/MobileCydia.app/Sections/Utilities.png index f7dd1e7..fab5d32 100644 Binary files a/MobileCydia.app/Sections/Utilities.png and b/MobileCydia.app/Sections/Utilities.png differ diff --git a/MobileCydia.app/Sections/Wallpaper.png b/MobileCydia.app/Sections/Wallpaper.png index 3d57101..1060fa0 100644 Binary files a/MobileCydia.app/Sections/Wallpaper.png and b/MobileCydia.app/Sections/Wallpaper.png differ diff --git a/MobileCydia.app/Sections/WebClips.png b/MobileCydia.app/Sections/WebClips.png index 7baaa68..7ed4053 100644 Binary files a/MobileCydia.app/Sections/WebClips.png and b/MobileCydia.app/Sections/WebClips.png differ diff --git a/MobileCydia.app/Sections/Widgets.png b/MobileCydia.app/Sections/Widgets.png index df5e5ce..ca8c1ef 100644 Binary files a/MobileCydia.app/Sections/Widgets.png and b/MobileCydia.app/Sections/Widgets.png differ diff --git a/MobileCydia.app/Sections/X Window.png b/MobileCydia.app/Sections/X Window.png index a81af8a..eac01e9 100644 Binary files a/MobileCydia.app/Sections/X Window.png and b/MobileCydia.app/Sections/X Window.png differ diff --git a/MobileCydia.app/changes@2x.png b/MobileCydia.app/changes@2x.png index 6485a24..aa6a29a 100644 Binary files a/MobileCydia.app/changes@2x.png and b/MobileCydia.app/changes@2x.png differ diff --git a/MobileCydia.app/chevron@2x.png b/MobileCydia.app/chevron@2x.png index 3851aaf..9905c17 100644 Binary files a/MobileCydia.app/chevron@2x.png and b/MobileCydia.app/chevron@2x.png differ diff --git a/MobileCydia.app/commercial.png b/MobileCydia.app/commercial.png index d89b332..8599f48 100644 Binary files a/MobileCydia.app/commercial.png and b/MobileCydia.app/commercial.png differ diff --git a/MobileCydia.app/console.png b/MobileCydia.app/console.png index aa63739..dba3788 100644 Binary files a/MobileCydia.app/console.png and b/MobileCydia.app/console.png differ diff --git a/MobileCydia.app/email.png b/MobileCydia.app/email.png index abc76d1..1aa20b3 100644 Binary files a/MobileCydia.app/email.png and b/MobileCydia.app/email.png differ diff --git a/MobileCydia.app/expanded.png b/MobileCydia.app/expanded.png index 4fa3711..9efce56 100644 Binary files a/MobileCydia.app/expanded.png and b/MobileCydia.app/expanded.png differ diff --git a/MobileCydia.app/filesystem.png b/MobileCydia.app/filesystem.png index 5097038..1bb23fe 100644 Binary files a/MobileCydia.app/filesystem.png and b/MobileCydia.app/filesystem.png differ diff --git a/MobileCydia.app/home-Selected@2x.png b/MobileCydia.app/home-Selected@2x.png index e5138fd..748be33 100644 Binary files a/MobileCydia.app/home-Selected@2x.png and b/MobileCydia.app/home-Selected@2x.png differ diff --git a/MobileCydia.app/home@2x.png b/MobileCydia.app/home@2x.png index 4c5ff62..72b7297 100644 Binary files a/MobileCydia.app/home@2x.png and b/MobileCydia.app/home@2x.png differ diff --git a/MobileCydia.app/icon-72.png b/MobileCydia.app/icon-72.png index 1f5a1de..1dbce13 100644 Binary files a/MobileCydia.app/icon-72.png and b/MobileCydia.app/icon-72.png differ diff --git a/MobileCydia.app/icon.png b/MobileCydia.app/icon.png index db7616d..61d51dd 100644 Binary files a/MobileCydia.app/icon.png and b/MobileCydia.app/icon.png differ diff --git a/MobileCydia.app/icon@2x.png b/MobileCydia.app/icon@2x.png index cfe44a2..1ec010c 100644 Binary files a/MobileCydia.app/icon@2x.png and b/MobileCydia.app/icon@2x.png differ diff --git a/MobileCydia.app/iconClassic.png b/MobileCydia.app/iconClassic.png index 37bdfbc..384c582 100644 Binary files a/MobileCydia.app/iconClassic.png and b/MobileCydia.app/iconClassic.png differ diff --git a/MobileCydia.app/id.png b/MobileCydia.app/id.png index 26d6165..f168812 100644 Binary files a/MobileCydia.app/id.png and b/MobileCydia.app/id.png differ diff --git a/MobileCydia.app/install@2x.png b/MobileCydia.app/install@2x.png index 6b2ea99..dfb8212 100644 Binary files a/MobileCydia.app/install@2x.png and b/MobileCydia.app/install@2x.png differ diff --git a/MobileCydia.app/installed.png b/MobileCydia.app/installed.png index 89017d8..2f86f0a 100644 Binary files a/MobileCydia.app/installed.png and b/MobileCydia.app/installed.png differ diff --git a/MobileCydia.app/installed@2x.png b/MobileCydia.app/installed@2x.png index 8d6bc3f..ab86df2 100644 Binary files a/MobileCydia.app/installed@2x.png and b/MobileCydia.app/installed@2x.png differ diff --git a/MobileCydia.app/installing.png b/MobileCydia.app/installing.png index aa27d7c..6332fef 100644 Binary files a/MobileCydia.app/installing.png and b/MobileCydia.app/installing.png differ diff --git a/MobileCydia.app/manage@2x.png b/MobileCydia.app/manage@2x.png index d2f9b7c..cfb8c13 100644 Binary files a/MobileCydia.app/manage@2x.png and b/MobileCydia.app/manage@2x.png differ diff --git a/MobileCydia.app/menes/chevron.png b/MobileCydia.app/menes/chevron.png index 1bfefe6..6ff8205 100644 Binary files a/MobileCydia.app/menes/chevron.png and b/MobileCydia.app/menes/chevron.png differ diff --git a/MobileCydia.app/menes/chevron@2x.png b/MobileCydia.app/menes/chevron@2x.png index 3851aaf..9905c17 100644 Binary files a/MobileCydia.app/menes/chevron@2x.png and b/MobileCydia.app/menes/chevron@2x.png differ diff --git a/MobileCydia.app/packages.png b/MobileCydia.app/packages.png index d5dde3c..404fe0c 100644 Binary files a/MobileCydia.app/packages.png and b/MobileCydia.app/packages.png differ diff --git a/MobileCydia.app/removing.png b/MobileCydia.app/removing.png index 2fdb272..935d4c7 100644 Binary files a/MobileCydia.app/removing.png and b/MobileCydia.app/removing.png differ diff --git a/MobileCydia.app/search@2x.png b/MobileCydia.app/search@2x.png index a7b17f3..74d6381 100644 Binary files a/MobileCydia.app/search@2x.png and b/MobileCydia.app/search@2x.png differ diff --git a/MobileCydia.app/settings.png b/MobileCydia.app/settings.png index e277493..86f4e78 100644 Binary files a/MobileCydia.app/settings.png and b/MobileCydia.app/settings.png differ diff --git a/MobileCydia.app/source.png b/MobileCydia.app/source.png index b101a99..2dcfdbc 100644 Binary files a/MobileCydia.app/source.png and b/MobileCydia.app/source.png differ diff --git a/MobileCydia.app/source@2x.png b/MobileCydia.app/source@2x.png index 7613b1f..65d70c3 100644 Binary files a/MobileCydia.app/source@2x.png and b/MobileCydia.app/source@2x.png differ diff --git a/MobileCydia.app/sources.png b/MobileCydia.app/sources.png index 88398f2..e8422e4 100644 Binary files a/MobileCydia.app/sources.png and b/MobileCydia.app/sources.png differ diff --git a/MobileCydia.app/star.png b/MobileCydia.app/star.png index 0695303..f762a24 100644 Binary files a/MobileCydia.app/star.png and b/MobileCydia.app/star.png differ diff --git a/MobileCydia.app/storage.png b/MobileCydia.app/storage.png index 5c93ee6..3cefef0 100644 Binary files a/MobileCydia.app/storage.png and b/MobileCydia.app/storage.png differ diff --git a/MobileCydia.app/trusted.png b/MobileCydia.app/trusted.png index ac6aa0c..de249eb 100644 Binary files a/MobileCydia.app/trusted.png and b/MobileCydia.app/trusted.png differ diff --git a/MobileCydia.app/unknown.png b/MobileCydia.app/unknown.png index e0ff4b2..92d7338 100644 Binary files a/MobileCydia.app/unknown.png and b/MobileCydia.app/unknown.png differ diff --git a/MobileCydia.app/version.png b/MobileCydia.app/version.png index b03fc57..fd1eec1 100644 Binary files a/MobileCydia.app/version.png and b/MobileCydia.app/version.png differ diff --git a/MobileCydia.app/warning.png b/MobileCydia.app/warning.png index bf06412..8d3e5df 100644 Binary files a/MobileCydia.app/warning.png and b/MobileCydia.app/warning.png differ diff --git a/MobileCydia.app/web.png b/MobileCydia.app/web.png index 35ca612..a4f04e3 100644 Binary files a/MobileCydia.app/web.png and b/MobileCydia.app/web.png differ -- cgit v1.2.3 From d1ba8fd35b8ff678f11f783e0329495f991714e5 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 14 Dec 2010 14:50:42 -0800 Subject: Use dpkg-deb -z to specify compression type. --- makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/makefile b/makefile index 095831e..d437f41 100644 --- a/makefile +++ b/makefile @@ -12,8 +12,16 @@ endif flags := link := -#dpkg := /Library/Cydia/bin/dpkg-deb -Zlzma +ifeq (o,O) # gzip is actually better +dpkg := /Library/Cydia/bin/dpkg-deb +ifeq ($(wildcard $(dpkg)),$(dpkg)) +dpkg := $(dpkg) -zlzma +else +dpkg := dpkg-deb -zbzip2 +endif +else dpkg := dpkg-deb +endif sdk := $(sdks)/iPhoneOS$(ios).sdk -- cgit v1.2.3 From ce0372dbb498eb933e0b3ef1b66213e9cb8111a5 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 14 Dec 2010 14:51:04 -0800 Subject: Display the size of the output package after dpkg-deb. --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index d437f41..3c6cda4 100644 --- a/makefile +++ b/makefile @@ -107,6 +107,6 @@ package: MobileCydia mkdir -p debs ln -sf debs/cydia_$$(./version.sh)_iphoneos-arm.deb Cydia.deb $(dpkg) -b _ Cydia.deb - readlink Cydia.deb + @echo "$$(stat -L -f "%z" Cydia.deb) $$(stat -f "%Y" Cydia.deb)" .PHONY: all clean sign -- cgit v1.2.3 From 02586d01938a4b3960006d16ce1e88b533f7937d Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 14 Dec 2010 14:52:21 -0800 Subject: Removed random source icons from Cydia's package. --- MobileCydia.app/Sources/cy.sosiphone.com.png | Bin 3127 -> 0 bytes MobileCydia.app/Sources/iphone.hackndev.org.png | Bin 1655 -> 0 bytes MobileCydia.app/Sources/iphonehe.com.png | Bin 10770 -> 0 bytes MobileCydia.app/Sources/urbanfanatics.com.png | Bin 7057 -> 0 bytes MobileCydia.app/Sources/www.zodttd.com.png | Bin 2482 -> 0 bytes 5 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 MobileCydia.app/Sources/cy.sosiphone.com.png delete mode 100644 MobileCydia.app/Sources/iphone.hackndev.org.png delete mode 100644 MobileCydia.app/Sources/iphonehe.com.png delete mode 100644 MobileCydia.app/Sources/urbanfanatics.com.png delete mode 100644 MobileCydia.app/Sources/www.zodttd.com.png diff --git a/MobileCydia.app/Sources/cy.sosiphone.com.png b/MobileCydia.app/Sources/cy.sosiphone.com.png deleted file mode 100644 index b848d95..0000000 Binary files a/MobileCydia.app/Sources/cy.sosiphone.com.png and /dev/null differ diff --git a/MobileCydia.app/Sources/iphone.hackndev.org.png b/MobileCydia.app/Sources/iphone.hackndev.org.png deleted file mode 100644 index 1f701df..0000000 Binary files a/MobileCydia.app/Sources/iphone.hackndev.org.png and /dev/null differ diff --git a/MobileCydia.app/Sources/iphonehe.com.png b/MobileCydia.app/Sources/iphonehe.com.png deleted file mode 100644 index b20263e..0000000 Binary files a/MobileCydia.app/Sources/iphonehe.com.png and /dev/null differ diff --git a/MobileCydia.app/Sources/urbanfanatics.com.png b/MobileCydia.app/Sources/urbanfanatics.com.png deleted file mode 100644 index 9cf47c4..0000000 Binary files a/MobileCydia.app/Sources/urbanfanatics.com.png and /dev/null differ diff --git a/MobileCydia.app/Sources/www.zodttd.com.png b/MobileCydia.app/Sources/www.zodttd.com.png deleted file mode 100644 index 83a3b33..0000000 Binary files a/MobileCydia.app/Sources/www.zodttd.com.png and /dev/null differ -- cgit v1.2.3 From 91107ccf316c36dc964e1cdf6c74d216fbce4aa4 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 14 Dec 2010 17:04:01 -0800 Subject: g++ -mthumb --- makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefile b/makefile index 3c6cda4..5fbff17 100644 --- a/makefile +++ b/makefile @@ -58,7 +58,7 @@ backrow += -FAppleTV -framework BackRow -framework AppleTV #cycc = cycc -r4.2 -i$(ios) -o$@ gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-$(gcc) -cycc = $(gxx) -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F/Library/Frameworks +cycc = $(gxx) -mthumb -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F/Library/Frameworks all: MobileCydia -- cgit v1.2.3 From 7fc0298900fd912b962229f23d090fc422320019 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 14 Dec 2010 18:40:38 -0800 Subject: Use pngcrush to crush the images as we build the package. --- makefile | 2 ++ pngcrush.sh | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100755 pngcrush.sh diff --git a/makefile b/makefile index 5fbff17..9a1145d 100644 --- a/makefile +++ b/makefile @@ -100,6 +100,8 @@ package: MobileCydia mkdir -p _/DEBIAN ./control.sh _ >_/DEBIAN/control + find _ -name '*.png' -exec ./pngcrush.sh '{}' ';' + sudo chown -R 0 _ sudo chgrp -R 0 _ sudo chmod 6755 _/Applications/Cydia.app/MobileCydia diff --git a/pngcrush.sh b/pngcrush.sh new file mode 100755 index 0000000..69715fb --- /dev/null +++ b/pngcrush.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +png=$1 +steps=() + +function step() { + "$@" + mv -f {_,}_.png + steps+=($(stat -f "%z" _.png)) +} + +pngcrush=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/pngcrush + +grep CgBI "${png}" &>/dev/null && exit 0 + +step cp -fa "${png}" __.png + +#step "${pngcrush}" -q -rem alla -reduce -brute -iphone {,_}_.png + +#step "${pngcrush}" -q -rem alla -reduce -brute {,_}_.png +#step pincrush {,_}_.png + +step "${pngcrush}" -q -rem alla -reduce -iphone {,_}_.png + +#"${pngcrush}" -q -rem alla -reduce -brute -iphone "${png}" 1.png +#"${pngcrush}" -q -iphone _.png 2.png +#ls -la 1.png 2.png + +mv -f _.png "${png}" + +echo -n "${png##*/} " +for ((i = 0; i != ${#steps[@]}; ++i)); do + if [[ $i != 0 ]]; then + echo -n " " + fi + + echo -n "${steps[i]}" +done + +printf $' %.0f%%\n' "$((steps[${#steps[@]}-1] * 100 / steps[0]))" -- cgit v1.2.3 From 1e94d48bab22034f48a4f7846697b3d443476f30 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 21 Dec 2010 22:48:45 -0800 Subject: Remove (non-functional) shake-to-undo mechanism. --- MobileCydia.mm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MobileCydia.mm b/MobileCydia.mm index 9824346..3837d7b 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -8965,6 +8965,9 @@ static _finline void _setHomePage(Cydia *self) { _trace(); CydiaApp = self; + if ([self respondsToSelector:@selector(setApplicationSupportsShakeToEdit:)]) + [self setApplicationSupportsShakeToEdit:NO]; + [NSURLCache setSharedURLCache:[[[SDURLCache alloc] initWithMemoryCapacity:524288 diskCapacity:10485760 -- cgit v1.2.3 From b9fed9bc261c54a9f81815cbc48c2a8caa77a2ff Mon Sep 17 00:00:00 2001 From: Ryan Petrich Date: Mon, 3 Jan 2011 01:28:47 -0700 Subject: Fix crash on Changes tab due to section index out of bounds --- MobileCydia.mm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MobileCydia.mm b/MobileCydia.mm index 3837d7b..dc0f87d 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -7483,7 +7483,10 @@ freeing the view controllers on tab change */ if ([database_ era] != era_) return nil; - Section *section([sections_ objectAtIndex:[path section]]); + NSUInteger sectionIndex([path section]); + if (sectionIndex >= [sections_ count]) + return nil; + Section *section([sections_ objectAtIndex:sectionIndex]); NSInteger row([path row]); return [[[self packageAtIndex:([section row] + row)] retain] autorelease]; } } -- cgit v1.2.3 From ab3f6a01181006920109384f662d02979b5cfb81 Mon Sep 17 00:00:00 2001 From: Ryan Petrich Date: Mon, 3 Jan 2011 06:29:52 -0700 Subject: Show dead sources --- MobileCydia.mm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/MobileCydia.mm b/MobileCydia.mm index dc0f87d..8b596a1 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -1346,6 +1346,7 @@ typedef std::map< unsigned long, _H > SourceMap; pkgSourceList *list_; SourceMap sources_; + CFMutableArrayRef deadSources_; CFMutableArrayRef packages_; _transient NSObject *delegate_; @@ -3040,6 +3041,8 @@ static NSString *Warning_; - (void) dealloc { // XXX: actually implement this thing _assert(false); + if (deadSources_) + CFRelease(deadSources_); [self releasePackages]; apr_pool_destroy(pool_); NSRecycleZone(zone_); @@ -3157,6 +3160,7 @@ static NSString *Warning_; capacity += 1024; packages_ = CFArrayCreateMutable(kCFAllocatorDefault, capacity, NULL); + deadSources_ = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); int fds[2]; @@ -3231,6 +3235,7 @@ static NSString *Warning_; NSMutableArray *sources([NSMutableArray arrayWithCapacity:sources_.size()]); for (SourceMap::const_iterator i(sources_.begin()); i != sources_.end(); ++i) [sources addObject:i->second]; + [sources addObjectsFromArray:(NSArray *)deadSources_]; return sources; } @@ -3337,7 +3342,9 @@ static NSString *Warning_; ++era_; [self releasePackages]; + sources_.clear(); + CFArrayRemoveAllValues(deadSources_); _error->Discard(); @@ -3427,14 +3434,19 @@ static NSString *Warning_; } for (pkgSourceList::const_iterator source = list_->begin(); source != list_->end(); ++source) { + bool found = false; std::vector *indices = (*source)->GetIndexFiles(); for (std::vector::const_iterator index = indices->begin(); index != indices->end(); ++index) // XXX: this could be more intelligent if (dynamic_cast(*index) != NULL) { pkgCache::PkgFileIterator cached((*index)->FindInCache(cache_)); - if (!cached.end()) + if (!cached.end()) { sources_[cached->ID] = [[[Source alloc] initWithMetaIndex:*source inPool:pool_] autorelease]; + found = true; + } } + if (!found) + CFArrayAppendValue(deadSources_, [[[Source alloc] initWithMetaIndex:*source inPool:pool_] autorelease]); } { -- cgit v1.2.3 From 9c8730d27cb4ca97a5034de527be90c975144c5e Mon Sep 17 00:00:00 2001 From: Grant Paul Date: Mon, 3 Jan 2011 23:05:26 -0800 Subject: Until the ignored toggle saves state, disallow modifying the state. --- MobileCydia.mm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MobileCydia.mm b/MobileCydia.mm index 8b596a1..79b3495 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -7855,6 +7855,8 @@ freeing the view controllers on tab change */ [ignoredCell_ setText:UCLocalize("IGNORE_UPGRADES")]; [ignoredCell_ setAccessoryView:ignoredSwitch_]; [ignoredCell_ setSelectionStyle:UITableViewCellSelectionStyleNone]; + // FIXME: Ignored state is not saved. + [ignoredCell_ setUserInteractionEnabled:NO]; [table_ setDataSource:self]; [table_ setDelegate:self]; -- cgit v1.2.3