Skip to content
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

New package: textadept-10.6 [Deprecated] #15278

Closed
wants to merge 1 commit into from

Conversation

reback00
Copy link
Contributor

@reback00 reback00 commented Oct 9, 2019

Textadept is a very lightweight and fast text editor written in C. It is extensible with Lua. The project aims to keep the C code within 2000 lines but has standard functionalities of other text editors.
Hope it is useful.

NOTICE: Unfortunately I messed up this PR due to a corruption in my local repo. It was too late to notice and this PR got closed automatically. I have opened a new PR with a clean commit. Please ignore this PR. I have added "[Deprecated]" on the title to avoid any confusion between the 2 PRs. I Apologize for any inconvenience.

@mobinmob
Copy link
Contributor

Thank you for taking the time to package textadept!
Please include only the patch for textadept in the PR, not the patch for lbry-desktop ;)

@reback00
Copy link
Contributor Author

reback00 commented Oct 13, 2019

@mobinmob Well, this seems like an uncommon issue for me. You see, I have submitted 2 PRs. One for lbry-desktop and one for textadept (this one). The problem is that 2 commits are both showing up in this PR for some reason. I have created separate branches, but still. Maybe lbry-desktop has not yet been merged, that's why. I'm not sure. I haven't done multiple PRs before within short period of time.

If you check the New package: textadept-10.6 commit, it does not have any patches.

The patch is in the New package: lbry-desktop-0.36.0 commit as it should be. But for some reason they are both showing up in the Commits and Files changed tabs in this page.

I was trying for #Hacktoberfest. Hence the hurry. Please let me know if I can do anything to not cause this in future.

@mobinmob
Copy link
Contributor

If you created the textadept branch while you were in the ibry-dekstop branch, the textadept one contains the commits of both branches.
Before creating a branch for a PR and committing to it, make sure you are on master.
You can still fix it :)

@reback00 reback00 force-pushed the textadept-branch branch 2 times, most recently from 97fbbe5 to ee6fb76 Compare October 13, 2019 17:17
@reback00
Copy link
Contributor Author

Yes, this is exactly what I've done! Thanks for pointing that out.

I have deleted the extra lbry commit and force pushed. Now it should be ok.

pkgname=textadept
version=10.6
revision=1
archs="i686 x86_64"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not see why to restrict to these archs. Cross builds are broken but looks patchable. Note, that even if cross won't work, this should be replaced with nocross to allow to build for aarch on aarch.

Copy link
Contributor Author

@reback00 reback00 Oct 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Chocimier It fails the build. (Log)

Is it possible to make it work? I'm adding nocross for now. (UPDATE: Added)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

vsed -i -e 's/CC = /CC ?= /' -e 's/CFLAGS = /CFLAGS ?= /' -e 's/CXX = /CXX ?= /' -e 's/CXXFLAGS = /CXXFLAGS ?= /' Makefile in pre_configure is enough to build (I do not have hardware to test on)

revision=1
archs="i686 x86_64"
wrksrc=textadept-textadept_${version}
hostmakedepends="autoconf automake gettext libtool clang wget unzip darcs pkg-config glib-devel ncurses"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Void is build with gcc and clang isn't used during build anyway. gettext is available by default. Ideally, deps should be added to distfiles for caching, then wget, unzip, maybe darcs won't be needed too.

Copy link
Contributor Author

@reback00 reback00 Oct 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some files cannot be downloaded when added to distfiles. e.g. I noticed it runs wget -O bombay.zip http://foicica.com/hg/bombay/archive/tip.zip. So I added http://foicica.com/hg/bombay/archive/tip.zip>bombay.zip to distfiles and it complains like this:

=> textadept-10.6_1: fetching distfile 'bombay.zip'...
http://foicica.com/hg/bombay/archive/tip.zip: (null)
=> ERROR: textadept-10.6_1: failed to fetch bombay.zip.

But I can access it fine on a browser, but it downloads as bombay-3852895f5313.zip. Do you know if xbps can handle redirection?

Files not in http://foicica.com/hg/ work fine and I'll add them. (UPDATE: Added)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use these addresses then. We should not use unversioned sources anyway.

One address per line please, same like checksum.

Files are downloaded by make deps anyway. You need to copy into build dir like libreoffice do.

wrksrc=textadept-textadept_${version}
hostmakedepends="autoconf automake gettext libtool clang wget unzip darcs pkg-config glib-devel ncurses"
makedepends="gtk+-devel ncurses-devel"
depends="gtk+ lua52"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gtk+ is discovered automatically.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, removed.

checksum=2cb2aa8266c166ed4a3f534843aa75cec0dc1ced09c007aaef540e3a7999870b

pre_configure() {
cd src
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is better to include in wrksrc imho, even if xlint will complain.

@leahneukirchen, do you remember reason for discouraging deep wrksrc?

Copy link
Contributor Author

@reback00 reback00 Oct 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have changed wrksrc to .../src and travis is complaining:

srcpkgs/textadept/template:5: wrksrc should be a top-level directory

Will it be a problem?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, John explained me it's wrong, leave wrksrc as is and set build_wrksrc=src.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added it and I got all Green checks. But then I saw this in Manual:

create_wrksrc ... Required if a package contains multiple distfiles.

I added create_wrksrc=yes and it fails in some builds with:

=> textadept-10.6_1: extracting distfile(s), please wait...
/void-packages/common/xbps-src/shutils/common.sh: line 33: cd: src: No such file or directory
=> ERROR: textadept-10.6_1: cannot access build_wrksrc directory [src]
The command "if [ -z "$XLINT" ]; then docker exec -t void hostrepo/common/travis/build.sh $BOOTSTRAP $ARCH; fi" exited with 1.

Is create_wrksrc absolutely necessary? or is there a fix I can apply?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not required in this case + #15278 (comment)


do_build() {
cd src
make
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

makejobs please

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, added.

}

post_install() {
vlicense LICENSE
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move to do_install, as there is one.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, moved

@reback00 reback00 force-pushed the textadept-branch branch 7 times, most recently from 1f9369b to 540a813 Compare October 17, 2019 18:55
@reback00
Copy link
Contributor Author

reback00 commented Oct 18, 2019

I had a corruption of my local git repo, because my machine hanged in the middle. I managed to do a commit, but now ~17k files are included in the commit! Can anyone help me solve that?

I did the git add srcpkgs/textadept and git commit --amend and then git push -f, but there are some other files now in the commit. Furthermore, the PR is closed automatically.

@Chocimier
Copy link
Member

If you have no other local changes to recover, i guess it easiest to clone your fork again and recreate commit from 540a813 link here.

@reback00
Copy link
Contributor Author

reback00 commented Oct 19, 2019

I think I'm done. I have applied the changes you suggested and have a backup of the last one locally. As this PR is closed, should I create a new PR?

@Chocimier
Copy link
Member

if possible reopen

@reback00
Copy link
Contributor Author

reback00 commented Oct 19, 2019

The "Reopen and comment" button is disabled when I try to post a comment. So I guess I'll have to post a new PR.

UPDATE: Opened a new PR here with a clean commit.

@reback00 reback00 changed the title New package: textadept-10.6 New package: textadept-10.6 [Deprecated] Oct 19, 2019
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 5, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants