Skip to content

/ haikuports

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hunspell: bump to 1.4.2, rename analyze, chmorph and {un,}munch. #867

Merged
merged 1 commit into from Dec 25, 2016
Merged

hunspell: bump to 1.4.2, rename analyze, chmorph and {un,}munch. #867

merged 1 commit into from Dec 25, 2016

Conversation

@fbrosson
Copy link
Member

fbrosson commented Nov 12, 2016

Gentoo renames four utilities (analyze, chmorph, munch, unmunch) by adding a hunspell- prefix to their names, to avoid having too generic names. So let's follow Gentoo, using their patch ;-)
Also remove any empty data/locale/*/LC_MESSAGES dirs (hu & it).
@fbrosson
fbrosson reviewed Nov 12, 2016
View changes
app-text/hunspell/hunspell-1.4.2.recipe
@@ -73,6 +83,10 @@ INSTALL()
make install

rm $libDir/charset.alias $libDir/*.la

# remove any existing (but empty) data/locale/*/LC_MESSAGES directory
rmdir $dataDir/locale/*/LC_MESSAGES $dataDir/locale/* || true

This comment has been minimized.

Sign in to view
Copy link
@fbrosson

fbrosson Nov 12, 2016

Author Member

I did not dare to also

    rm $dataDir/locale/locale.alias

Shall I do so, before the rmdir, and then also rmdir $dataDir ?
Because the only file in $dataDir is data/locale/locale.alias, but it either gets shadowed by the locale.alias from another package or shadows all locale.alias from the other packages.

Reminder: on some other packages we already drop data/locale/charset.alias, so I was wondering if we should also treat this locale.alias file same way we already treat the charset.alias file.
Thanks!

This comment has been minimized.

Sign in to view
Copy link
@korli

korli Nov 23, 2016

Contributor

No idea. I would say, if it's empty it can be removed.

This comment has been minimized.

Sign in to view
Copy link
@fbrosson

fbrosson Nov 24, 2016

Author Member

It is not empty. It has some comments and then 47 lines of aliases for locales.
BTW, the last comment is «# Packages using this file: hunspell».
I guess we should keep the locale.alias file, at least until we add a hunspell dictionary and test hunspell without the locale.alias file.
@korli
Copy link
Contributor

korli commented Nov 28, 2016

1.5.3 is out.
@fbrosson
Copy link
Member Author

fbrosson commented Nov 28, 2016 •
edited

Cool, thanks! I'll try 1.5.3.
BTW, a few days ago I noticed that 1.5.2 was out so I was trying to build it, but I've hit an issue:

In file included from xsize.c:3:0:
xsize.h:31:3: error: #error "Please include config.h first."
  #error "Please include config.h first."

xsize.h:33:1: error: unknown type name '_GL_INLINE_HEADER_BEGIN'
 _GL_INLINE_HEADER_BEGIN
@fbrosson
Copy link
Member Author

fbrosson commented Nov 28, 2016

I've added 1.5.2 and 1.5.3 in case someone would like to have a look at it. Both fail to build.
@waddlesplash
Copy link
Member

waddlesplash commented Dec 25, 2016

Should we merge the recipe anyway, as broken?
@fbrosson
Copy link
Member Author

fbrosson commented Dec 25, 2016

As you wish. Le tme see if the latest 1.5.x release works better.
If not then I guess that bumping to the working 1.4.2 and adding the latest 1.5.x marked as broken is what we need. (I guess this is what you are suggesting.)
Just give me half an hour and I'll update my PR.
@fbrosson
Copy link
Member Author

fbrosson commented Dec 25, 2016

1.6.0 was released 3 days ago. I'll try it.
@fbrosson
hunspell: bump to 1.4.2, rename analyze, chmorph and {un,}munch.
Loading status checks…
d8a6d1e 
Gentoo renames four utilities (analyze, chmorph, munch, unmunch)
by adding a hunspell- prefix to their names, to avoid having too
generic names. So let's follow Gentoo, using their patch ;-)
Also remove any empty data/locale/*/LC_MESSAGES dirs (hu & it).

Also added 1.5.4 and 1.6.0 which both fail to build.
@fbrosson
Copy link
Member Author

fbrosson commented Dec 25, 2016

That's it.
I did not touch 1.4.2, which was already working when I created this PR.

I've included 1.5.4 and 1.6.0, which both fail to build, so I marked them as broken.
We can merge this PR as is or without the broken releases.
But I guess it might be worth having them, so that anyone willing to investigate on these newer releases won't need to redo the packaging.
@waddlesplash
Copy link
Member

waddlesplash commented Dec 25, 2016

Sounds good.
@waddlesplash waddlesplash merged commit de8f825 into haikuports:master Dec 25, 2016
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@fbrosson fbrosson deleted the fbrosson:hunspell branch Dec 25, 2016
korli added a commit to korli/haikuports that referenced this pull request Jan 26, 2017
@fbrosson @korli
hunspell: bump to 1.4.2, rename analyze, chmorph and {un,}munch. (hai…
8b81c78 
…kuports#867)

Gentoo renames four utilities (analyze, chmorph, munch, unmunch)
by adding a hunspell- prefix to their names, to avoid having too
generic names. So let's follow Gentoo, using their patch ;-)
Also remove any empty data/locale/*/LC_MESSAGES dirs (hu & it).

Also added 1.5.4 and 1.6.0 which both fail to build.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@korli korli

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
@fbrosson @korli @waddlesplash
You can’t perform that action at this time.