Bug 197752 - [PATCH] graphics/xournal: Update to 0.4.8
Summary: [PATCH] graphics/xournal: Update to 0.4.8
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Thomas Zander
URL:
Keywords: patch, patch-ready
Depends on:
Blocks:
 
Reported: 2015-02-17 00:00 UTC by Kalten
Modified: 2015-03-04 23:34 UTC (History)
2 users (show)

See Also:
bugzilla: maintainer-feedback? (me)


Attachments
graphics/xournal from r378348 to latest version 0.4.8 (4.94 KB, patch)
2015-02-17 00:00 UTC, Kalten
no flags Details | Diff
log: make.* output (34.61 KB, text/plain)
2015-02-17 00:06 UTC, Kalten
no flags Details
log: poudriere testport output (67.78 KB, text/plain)
2015-02-17 23:38 UTC, Kalten
no flags Details
graphics/xournal from r378348 to latest version 0.4.8 {v2} (7.29 KB, patch)
2015-02-24 02:08 UTC, Kalten
no flags Details | Diff
log: poudriere testport output {v2} (68.65 KB, text/plain)
2015-02-24 02:13 UTC, Kalten
no flags Details
log: make.* output {v2} (35.54 KB, text/plain)
2015-02-24 02:15 UTC, Kalten
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Kalten 2015-02-17 00:00:38 UTC
Created attachment 153093 [details]
graphics/xournal from r378348 to latest version 0.4.8

In the attachment you will find a patch updating graphics/xournal from
version 0.4.7_4 r378348 to the latest release 0.4.8 (released on
2014-06-30).

»portlint -AC« says:
---8<---
WARN: Makefile: [74]: use ${VARIABLE}, instead of $(VARIABLE).
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
0 fatal errors and 2 warnings found.
--->8---
The first warning is the result of a ${REINPLACE_CMD} in the post-patch
target.  I can not change that as using »{}« results in handling it wrong.

The output of
»setenv DEVELOPER yes; make clean; make stage && make check-plist && make stage-qa && make package«
will follow shortly.

The output of
»poudriere testport graphics/xournal«
will follow later (tomorrow?)

Thank you,
 Kalten
Comment 1 Bugzilla Automation freebsd_committer freebsd_triage 2015-02-17 00:00:38 UTC
Maintainer CC'd
Comment 2 Kalten 2015-02-17 00:06:52 UTC
Created attachment 153094 [details]
log: make.* output

»setenv DEVELOPER yes; make clean; make stage && make check-plist && make stage-qa && make package« output
Comment 3 me 2015-02-17 11:14:09 UTC
I will probably not be able to test the patch myself very soon.

As you make another attempt to introduce %%DATADIR%% into pkg-plist, did you compile and run time test it with a non-default value? The last few people trying to make the earlier versions of Xournal DATADIR-safe all gave up (crees, mva, and me). Does the new version fix DATADIR-usage? If the port is not DATADIR-safe, %%DATADIR%% must not be used in pkg-plist (from my understanding).

If the DATADIR-safety is tested and the submitter and committer both think the change is correct, I have no problem with the patch being committed without me testing it.
Comment 4 Kalten 2015-02-17 23:38:42 UTC
Created attachment 153127 [details]
log: poudriere testport output

»poudriere testport graphics/xournal« output
Comment 5 Kalten 2015-02-24 02:08:10 UTC
Created attachment 153411 [details]
graphics/xournal from r378348 to latest version 0.4.8  {v2}

> I will probably not be able to test the patch myself very soon.                                                                                                                             
I did not have time to do it earlier either ;-)                                                                                                                                               
                                                                                                                                                                                              
> As you make another attempt to introduce %%DATADIR%% into pkg-plist,                                                                                                                        
> did you compile and run time test it with a non-default value?                                                                                                                              
After some very long search I do assume that you mean                                                                                                                                         
»poudriere testport -j 101amd64 -o graphics/xournal -v -v -P«                                                                                                                                 
                                                                                                                                                                                              
> The last few people trying to make the earlier versions of Xournal DATADIR-safe                                                                                                             
> all gave up (crees, mva, and me). Does the new version fix DATADIR-usage? If the                                                                                                            
> port is not DATADIR-safe, %%DATADIR%% must not be used in pkg-plist (from my                                                                                                                
> understanding).                                                                                                                                                                             
Well: using that mechanism we do have errors using the original patch in                                                                                                                      
Attachment 153093 [details] exactly as you had feared.                                                                                                                                                  
                                                                                                                                                                                              
I have altered some more lines (see this Attachment (with “{v2}” attached to its                                                                                                              
name) replacing the old one) and after many hours of work (as I had to find out                                                                                                               
much) There remains one problem.  (pkg-plist seems to be in order now, but that                                                                                                               
one directory!—see below)                                                                                                                                                                     
                                                                                                                                                                                              
»poudriere testport -j 101amd64 -o graphics/xournal -v -v -P«                                                                                                                                 
states at the end: (full log will follow shortly)                                                                                                                                             
---8<---                                                                                                                                                                                      
>> […]                                                                                                                                                                                        
>> [101amd64-default] [1/1] Deinstalling xournal-0.4.8...                                                                                                                                     
>> [101amd64-default] [1/1] Deleting files for xournal-0.4.8... done                                                                                                                          
>> Directory '/prefix/xournal-0.4.8/share/mime/packages' does not exist!                                                                                                                      
>> ===========================================================================                                                                                                                
>> ====>> Checking for extra files and directories                                                                                                                                            
>> ====>> Error: Files or directories left over:                                                                                                                                              
>> @dir /prefix                                                                                                                                                                               
>> ====>> This test was done with PREFIX!=LOCALBASE which may show failures                                                                                                                   
>> if the port does not respect PREFIX. Try testport with -n to use                                                                                                                           
>> PREFIX=LOCALBASE                                                                                                                                                                           
>> [00:02:29] ====>> Saved xournal-0.4.8 wrkdir to:                                                                                                                                           
>> /usr/local/poudriere/data/wrkdirs/101amd64-default/default/xournal-0.4.8.tbz                                                                                                               
>> build of graphics/xournal ended at Tue Feb 24 00:06:44 UTC 2015                                                                                                                            
>> build time: 00:01:52                                                                                                                                                                       
>> !!! build failure encountered !!!                                                                                                                                                          
>> [00:02:29] ====>> Error: Build failed in phase: leftovers                                                                                                                                  
>> […]                                                                                                                                                                                        
--->8---                                                                                                                                                                                      
                                                                                                                                                                                              
The essential lines seem to be:                                                                                                                                                               
---8<---                                                                                                                                                                                      
>> Directory '/prefix/xournal-0.4.8/share/mime/packages' does not exist!                                                                                                                      
>> ===========================================================================                                                                                                                
>> ====>> Checking for extra files and directories                                                                                                                                            
>> ====>> Error: Files or directories left over:                                                                                                                                              
>> @dir /prefix                                                                                                                                                                               
--->8---                                                                                                                                                                                      
                                                                                                                                                                                              
There were still some issues (files/patch-Makefile.in has been extended and                                                                                                                   
pkg-plist altered in comparison to my first patch) but I have lost my nerves                                                                                                                  
over this problem with that directory where the file mime/packages/xournal.xml                                                                                                                
is installed into—its situation is quite similar to that of the file                                                                                                                          
applications/xournal.desktop yet the latter works like a charm.                                                                                                                               
                                                                                                                                                                                              
> If the DATADIR-safety is tested and the submitter and committer both think the                                                                                                              
> change is correct, I have no problem with the patch being committed without me                                                                                                              
> testing it.                                                                                                                                                                                 
Well: this as said: that single problem remains!                                                                                                                                              
                                                                                                                                                                                              
May be you know how to fix it :-)                                                                                                                                                             
                                                                                                                                                                                              
                                                                                                                                                                                              
»portlint -AC« says: (same as last time—see Comment 0 please)                                                                                                                                 
---8<---                                                                                                                                                                                      
WARN: Makefile: [74]: use ${VARIABLE}, instead of $(VARIABLE).                                                                                                                                
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section                                                                                                                           
empty, to make SVN happy.                                                                                                                                                                     
0 fatal errors and 2 warnings found.                                                                                                                                                          
--->(---                                                                                                                                                                                      
                                                                                                                                                                                              
The output of                                                                                                                                                                                 
 »setenv DEVELOPER yes; make clean; make stage && make check-plist &&                                                                                                                         
make stage-qa && make package«                                                                                                                                                                
as well as                                                                                                                                                                                    
 »poudriere testport -j 101amd64 -o graphics/xournal -v -v -P«                                                                                                                                
will follow shortly.                                                                                                                                                                          
                                                                                                                                                                                              
Regards,                                                                                                                                                                                      
 Kalten
Comment 6 Kalten 2015-02-24 02:13:10 UTC
Created attachment 153412 [details]
log: poudriere testport output  {v2}

»poudriere testport -j 101amd64 -o graphics/xournal -v -v -P«
{v2}

(I am sorry for those terrible line breaks in my comment before that one!)
Comment 7 Kalten 2015-02-24 02:15:33 UTC
Created attachment 153413 [details]
log: make.* output  {v2}

»setenv DEVELOPER yes; make clean; make stage && make check-plist &&make stage-qa && make package«
{v2}
Comment 8 commit-hook freebsd_committer freebsd_triage 2015-03-04 23:31:42 UTC
A commit references this bug:

Author: riggs
Date: Wed Mar  4 23:31:26 UTC 2015
New revision: 380456
URL: https://svnweb.freebsd.org/changeset/ports/380456

Log:
  Updat to upstream version 0.4.8

  PR:		197752
  Submitted by:	kalten@gmx.at
  Approved by:	maintainer (implicit)

Changes:
  head/graphics/xournal/Makefile
  head/graphics/xournal/distinfo
  head/graphics/xournal/files/patch-Makefile.in
  head/graphics/xournal/pkg-plist
Comment 9 Thomas Zander freebsd_committer freebsd_triage 2015-03-04 23:34:39 UTC
As maintainer suspected, the port is not DATADIR-safe. Committed plist without the DATADIR macro.