Bug 424960 – sci-calculators/hcalc minor fixes

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description myhrlin 2012-07-05 18:36:07 UTC]

Created attachment 317336 [details]
hcalc source by DJ and by TK + diffs + new files (from TK)

Requesting minor fixes to DJ's hcalc. Diffs and sources attached.
Attachment:
   md5sum
    0013d33825d8df3ddac1d3e6b4808835 hcalc-everything.tar.xz
   shasum
    73da3ce97c15a62b76bb782441ddb734692b6eff hcalc-everything.tar.xz


Fixes:
   + Ability to close window -- No longer is it necessary to run just from command line and kill with ctrl+C.
   + Larger window for the elderly (TK)
   + Minor fixes to the code, no more complaints when compiling the source.


As customary the emerge --info

Portage 2.1.11.4 (hardened/linux/amd64, gcc-4.5.3, glibc-2.14.1-r3, 3.4.2-hardened-r1 x86_64)
=================================================================
                         System Settings
=================================================================
System uname: Linux-3.4.2-hardened-r1-x86_64-Intel-R-_Core-TM-2_Duo_CPU_T6600_@_2.20GHz-with-gentoo-2.1
Timestamp of tree: Tue, 03 Jul 2012 15:45:01 +0000
app-shells/bash:          4.2_p20
dev-java/java-config:     2.1.11-r3
dev-lang/python:          2.7.3-r2, 3.2.3
dev-util/cmake:           2.8.7-r5
dev-util/pkgconfig:       0.26
sys-apps/baselayout:      2.1-r1
sys-apps/openrc:          0.9.8.4
sys-apps/sandbox:         2.5
sys-devel/autoconf:       2.13, 2.68
sys-devel/automake:       1.9.6-r3, 1.11.1
sys-devel/binutils:       2.21.1-r1
sys-devel/gcc:            4.5.3-r2, 4.6.3
sys-devel/gcc-config:     1.6
sys-devel/libtool:        2.4-r1
sys-devel/make:           3.82-r1
sys-kernel/linux-headers: 3.4 (virtual/os-headers)
sys-libs/glibc:           2.14.1-r3
Repositories: gentoo
ACCEPT_KEYWORDS="amd64"
ACCEPT_LICENSE="* -@EULA"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-march=core2  -msse4.1 -O2 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/config /usr/share/gnupg/qualified.txt"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/env.d/java/ /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php5.3/ext-active/ /etc/php/cgi-php5.3/ext-active/ /etc/php/cli-php5.3/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/texmf/web2c"
CXXFLAGS="-march=core2  -msse4.1 -O2 -pipe"
DISTDIR="/usr/portage/distfiles"
FCFLAGS="-O2 -pipe"
FEATURES="assume-digests binpkg-logs config-protect-if-modified distlocks ebuild-locks fixlafiles news parallel-fetch parse-eapi-ebuild-head protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch"
FFLAGS="-O2 -pipe"
GENTOO_MIRRORS="ftp://mirror2.corbina.ru/gentoo-distfiles/ http://mirror.yandex.ru/gentoo-distfiles/ ftp://mirror.yandex.ru/gentoo-distfiles/"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
LINGUAS="af ar ca cs da de el eo es fa fi fr hr hu hy id it ja ko lt mk nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi en gd ga hi is he rw sa_IN sh zh_CN zh_TW"
MAKEOPTS="-j3"
PKGDIR="/usr/portage/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY=""
SYNC="rsync://rsync4.ru.gentoo.org/gentoo-portage"
USE="X acl alsa amd64 animgif berkdb bzip2 cdio cli cracklib crypt cups cxx dmx doc dri embed enchant fileinfo filter fpm gdbm gimp glamor gpm grub gtk hardened hash icons iconv intl ipv6 json justify kdrive ldap-sasl mhash mmx modules mp3 mudflap multilib mysqlnd ncurses nls nptl opengl openmp openssl pam pax_kernel pcre perl pppd readline session smp sna sse sse2 ssl ssse3 suhosin synaptics tcpd tools unicode urandom xinerama xml xmlreader xmlwriter xnest xorg xsl xvfb zip zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host 
authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" CALLIGRA_FEATURES="kexi words flow plan sheets stage tables krita karbon braindump" CAMERAS="ptp2" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ubx" INPUT_DEVICES="keyboard mouse evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" LINGUAS="af ar ca cs da de el eo es fa fi fr hr hu hy id it ja ko lt mk nb nl pl pt pt_BR ro ru sk sl sr sv tr uk vi en gd ga hi is he rw sa_IN sh zh_CN zh_
TW" PHP_TARGETS="php5-3" PYTHON_TARGETS="python3_2 python2_7" RUBY_TARGETS="ruby18 ruby19" USERLAND="GNU" VIDEO_CARDS="fbdev glint intel mach64 mga neomagic nouveau nv r128 radeon savage sis tdfx trident vesa via vmware dummy v4l" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account"
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LANG, LC_ALL, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, USE_PYTHON

[Comment 1 myhrlin 2012-07-05 18:38:01 UTC]

Woops -- disregard the attachment on the first post.
Attachment available at https://myhrlin.net/hcalc/

[Comment 2 Justin Lecher (RETIRED) 2012-07-06 08:03:22 UTC]

I don't get the content of the tarball. Could you please elaborate or simply past an updated version of the ebuild?

[Comment 3 myhrlin 2012-07-06 08:59:51 UTC]

(In reply to comment #2)
> I don't get the content of the tarball. Could you please elaborate or simply
> past an updated version of the ebuild?

Ah, sorry, I wasn't sure what all to include.  Within the tarball you'll find a plaintext file (combined-diffs-without-xpms.txt) containing only the Makefile, *.c, and *.h diffs combined (which I suppose isn't very useful).

Within the tk-hcalc.tar.gz tarball you'll find the modified source files with one additional xpm file.

dj-hcalc.tar.gz contains the current source files emerge uses to install hcalc.

diffs-and-new-files.tar.gz contains separate diff files between the source files in dj-hcalc.tar.gz and tk-hcalc.tar.gz.

Would it be alright to provide another patch file like the one located at /usr/portage/sci-calculators/hcalc/files/1.0-gentoo.patch?  It resembles the text file with the combined diffs.

[Comment 4 Justin Lecher (RETIRED) 2012-07-07 15:25:03 UTC]

I forked the code https://github.com/jlec/hcalc and included yours.


+*hcalc-1.2 (07 Jul 2012)
+
+  07 Jul 2012; Justin Lecher <[e-mail]> +hcalc-1.2.ebuild:
+  Version BUmp including code from Theodore Kilgore, #424960
+