X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f X-Recipient: geda-user AT delorie DOT com X-Virus-Scanned: Debian amavisd-new at papyrus.altaweb.hu Date: Fri, 10 Jul 2015 21:44:48 +0200 From: "Lev (leventelist AT gmail DOT com) [via geda-user AT delorie DOT com]" To: geda-user AT delorie DOT com Subject: [geda-user] building gEDA Message-ID: <20150710214448.2cac813e@jive.levalinux.org> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.27; amd64-portbld-freebsd10.1) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/9QpTYy9Lq3Sb+Z7klYpUZ.b" Reply-To: geda-user AT delorie DOT com --MP_/9QpTYy9Lq3Sb+Z7klYpUZ.b Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: base64 Content-Disposition: inline T2theSwgdGhpcyBoYXMgYmVlbiBzYWlkIGJlZm9yZS4gSSB0cmllZCB0byBidWlsZCBnRURBIG9u IEZyZWVCU0QsIGFuZA0KaXQgd2FzIG5vdCBwb3NzaWJsZSBvdXQgb2YgdGhlIGJveC4gVGhlIHBy b2JsZW0gd2FzIHRoZSBzYW1lLCB3aGVuIEkNCmxhc3QgdHJpZWQuIEkgc2VlIHRoZSBzYW1lIHBy b2JsZW1zIG92ZXIgYW5kIG92ZXIgYWdhaW4uDQoNCkknbSBzb3JyeSB0byBzYXkgdGhpcywgYnV0 IEknZCBsaWtlIHRvIGtpbmRseSBhc2sgZGV2ZWxvcGVycyBub3QgdG8gbWFrZSB0aGUNCnNhbWUg Y29kaW5nIGVycm9ycyBhZ2Fpbi4NCg0KUGF0Y2ggYXR0YWNoZWQuIEkgY2FuIGZpbGUgYnVnIHJl cG9ydCwgb3IgSSBjYW4gcmVvcGVuIHRoZSBwcmV2aW91cyBvbmUuDQoNCkl0IGlzIGFib3V0IHRo ZSB1c2FnZSBvZiBnX3JldHVybl9pZl9mYWlsKCkgYW5kIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKCku DQoNCkJhc2ljYWxseSwgaWYgdGhlIGZ1bmN0aW9uIHJldHVybnMgdm9pZCwgZ19yZXR1cm5faWZf ZmFpbCgpIHNoYWxsIGJlIHVzZWQuDQpPdGhlcndpc2UgZ19yZXR1cm5fdmFsX2lmX2ZhaWwoKSwg YW5kIHlvdSBzaG91bGQgc3VwcGx5IGEgcmV0dXJuIHZhbHVlIHRoYXQNCm1ha2VzIHNlbnNlLiBJ biBteSBwYXRjaCBJIHVzZWQgJ05VTEwnIGJ1dCBJIGRpZG4ndCByZWFsbHkgY2hlY2tlZCB0aGUg cmV0dXJuDQp0eXBlIG9mIHRoZSBmdW5jdGlvbnMsIHNvIG15IHBhdGNoIG11c3QgYmUgcmV2aWV3 ZWQgYmVmb3JlIGNvbW1pdC4NCg0KQWZmZWN0ZWQgZmlsZXM6DQoNCmdzY2hlbS9zcmMvZ3NjaGVt X29wdGlvbnNfZGlhbG9nLmMNCmdzY2hlbS9zcmMvb19idXMuYw0KZ3NjaGVtL3NyYy94X2dyaWQu Yw0KDQoNClRoZSBvdGhlciB0aGluZyBpcyB0aGUgaW5saW5lIHNlZCBzY3JpcHQgaW4gDQoNCmJ1 aWxkLXRvb2xzL2ljb24tdGhlbWUtaW5zdGFsbGVyDQoNCi0JaW5zdGFsbF9uYW1lPWBlY2hvICRi dWlsZF9uYW1lIHwgc2VkICdzLy1bMC05XVwrLy9nJ2ANCisJaW5zdGFsbF9uYW1lPWBlY2hvICRi dWlsZF9uYW1lIHwgc2VkICdzLy1bMC05XVswLTldKi8vZydgDQoNCkl0IHdvdWxkIGJlIHZlcnkg bmljZSwgaWYgSSAoYW5kIG90aGVyIEZyZWVCU0QvT1MtWCwgY2xhbmcsIG5vbi1MaW51eCB1c2Vy cykNCmNvdWxkIGJ1aWxkIGdzY2hlbSBvdXQgb2YgdGhlIGJveCwgd2l0aG91dCBlZGl0aW5nIHRo ZSBzb3VyY2UgY29kZS4gSXQgaXMNCm9rYXksIGlmIHNvbWV0aGluZyBuZXcgY29tZXMgdXAsIEkg YW0gbW9yZSB0aGFuIGhhcHB5IHRvIHNlbmQgcGF0Y2hlcy4NCg0KSXMgdGhpcyBva2F5LCB0aGF0 IHRoZSBidWlsZCBwcm9jZXNzIG92ZXJ3cml0ZXMgYWxsIHRoZSBwbyBmaWxlcz8gTXkgcGF0Y2gN Cmxvb2tzIHVnbHkuDQoNCkNoZWVycywNCkxldg0KDQotLSANCjczIGRlIEhBNU9HTA0KT3AuOiBM ZXZlbnRlDQo= --MP_/9QpTYy9Lq3Sb+Z7klYpUZ.b Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-gschem-fix-inline-sed-script-to-be-portable.patch From f72093edaf9130cf5946ddc7c54211c0966dda25 Mon Sep 17 00:00:00 2001 From: User Leva Date: Fri, 10 Jul 2015 21:37:12 +0200 Subject: [PATCH 1/2] gschem: fix inline sed script to be portable --- build-tools/icon-theme-installer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/icon-theme-installer b/build-tools/icon-theme-installer index 594dd72..cc90335 100755 --- a/build-tools/icon-theme-installer +++ b/build-tools/icon-theme-installer @@ -121,7 +121,7 @@ for icon in $@; do size=`echo $icon | sed -n 's/.*-\([0-9]*\).*/\1/p'` category=`echo $icon | cut -d, -f1` build_name=`echo $icon | cut -d, -f2` - install_name=`echo $build_name | sed 's/-[0-9]\+//g'` + install_name=`echo $build_name | sed 's/-[0-9][0-9]*//g'` install_name=`basename $install_name` if test -z $size; then -- 2.4.5 --MP_/9QpTYy9Lq3Sb+Z7klYpUZ.b Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0002-gschem-fix-compile-error-1424374.patch From 76da28851fd48feffdba50c3de61b6d4c14e5dda Mon Sep 17 00:00:00 2001 From: User Leva Date: Fri, 10 Jul 2015 21:41:05 +0200 Subject: [PATCH 2/2] gschem: fix compile error #1424374 --- gschem/src/gschem_options_dialog.c | 4 ++-- gschem/src/o_bus.c | 4 ++-- gschem/src/x_grid.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gschem/src/gschem_options_dialog.c b/gschem/src/gschem_options_dialog.c index ddd51a4..3979b91 100644 --- a/gschem/src/gschem_options_dialog.c +++ b/gschem/src/gschem_options_dialog.c @@ -216,7 +216,7 @@ create_grid_mode_widget (GschemOptionsDialog *dialog) GtkWidget *box; int index; - g_return_if_fail (dialog != NULL); + g_return_val_if_fail (dialog != NULL, NULL); box = gtk_hbox_new (FALSE, FALSE); @@ -339,7 +339,7 @@ create_snap_mode_widget (GschemOptionsDialog *dialog) GtkWidget *box; int index; - g_return_if_fail (dialog != NULL); + g_return_val_if_fail (dialog != NULL, NULL); box = gtk_hbox_new (FALSE, FALSE); diff --git a/gschem/src/o_bus.c b/gschem/src/o_bus.c index eca88b9..2e10019 100644 --- a/gschem/src/o_bus.c +++ b/gschem/src/o_bus.c @@ -66,8 +66,8 @@ void o_bus_end(GschemToplevel *w_current, int w_x, int w_y) GList *prev_conn_objects = NULL; g_assert( w_current->inside_action != 0 ); - g_return_val_if_fail (toplevel != NULL, FALSE); - g_return_val_if_fail (page != NULL, FALSE); + g_return_if_fail (toplevel != NULL); + g_return_if_fail (page != NULL); /* erase the rubberbus */ /* o_bus_invalidate_rubber (w_current); */ diff --git a/gschem/src/x_grid.c b/gschem/src/x_grid.c index 9024a3e..18fcbb2 100644 --- a/gschem/src/x_grid.c +++ b/gschem/src/x_grid.c @@ -398,7 +398,7 @@ int x_grid_query_drawn_spacing (GschemToplevel *w_current) { GRID_MODE grid_mode; - g_return_if_fail (w_current != NULL); + g_return_val_if_fail (w_current != NULL, NULL); grid_mode = gschem_options_get_grid_mode (w_current->options); -- 2.4.5 --MP_/9QpTYy9Lq3Sb+Z7klYpUZ.b--